Merge "Allow implicit-fallthrough warnings locally."

am: 36afe11a64

Change-Id: Ib185af9f85059f19cfd502b87bb6179d0d37ade7

libs/androidfw/Android.bp

@@ -59,6 +59,8 @@ cc_library {
         "ZipFileRO.cpp",
         "ZipUtils.cpp",
     ],
+    // Allow implicit fallthroughs in Locale.cpp and ResourceTypes.cpp until they are fixed.
+    cflags: ["-Wno-implicit-fallthrough"],
     export_include_dirs: ["include"],
     export_shared_lib_headers: ["libz"],
     target: {

media/jni/Android.bp

@@ -83,6 +83,9 @@ cc_library_shared {
         "-Wno-error=deprecated-declarations",
         "-Wunused",
         "-Wunreachable-code",
+        // Allow implicit fallthroughs in android_media_MediaScanner.cpp and
+        // android_mtp_MtpDatabase.cpp until they are fixed.
+        "-Wno-error=implicit-fallthrough",
     ],
 }
 

tools/aapt/Android.bp

@@ -71,6 +71,8 @@ cc_library_host_static {
     cflags: [
         "-Wno-format-y2k",
         "-DSTATIC_ANDROIDFW_FOR_TOOLS",
+        // Allow implicit fallthroughs in AaptAssets.cpp until they are fixed.
+        "-Wno-error=implicit-fallthrough",
     ],
 
     srcs: [

tools/incident_section_gen/Android.bp

@@ -24,6 +24,8 @@ cc_binary_host {
         "-O0",
         "-Wall",
         "-Werror",
+        // Allow implicit fallthroughs in main.cpp until they are fixed.
+        "-Wno-error=implicit-fallthrough",
     ],
     srcs: ["main.cpp"],
     shared_libs: [