diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-10-22 09:56:12 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2018-10-22 09:56:12 -0700 |
| commit | e8abd0677674aab095aa192f2a85b1632a962791 (patch) | |
| tree | a1561a64a462aa2764852ee75be1a06bb45bf754 | |
| parent | fccdf46adf096e9ba200ce79e00f6df379b5c649 (diff) | |
Allow implicit-fallthrough warnings locally.
It will be a global error by default.
Test: make checkbuild
Bug: 112564944
Change-Id: I26616fd50ccf3639fa7c01d850a14d079273ede7
Exempt-From-Owner-Approval: do not block on new warnings
| -rw-r--r-- | libs/androidfw/Android.bp | 2 | ||||
| -rw-r--r-- | media/jni/Android.bp | 3 | ||||
| -rw-r--r-- | tools/aapt/Android.bp | 2 | ||||
| -rw-r--r-- | tools/incident_section_gen/Android.bp | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 140001d673dd..0c32fdf5baf5 100644 --- a/libs/androidfw/Android.bp +++ b/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: { diff --git a/media/jni/Android.bp b/media/jni/Android.bp index 3215167c347e..4c563dbbe979 100644 --- a/media/jni/Android.bp +++ b/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", ], } diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp index a594e5bf0ce1..f36739730775 100644 --- a/tools/aapt/Android.bp +++ b/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: [ diff --git a/tools/incident_section_gen/Android.bp b/tools/incident_section_gen/Android.bp index f07445a17781..0c7797eacf09 100644 --- a/tools/incident_section_gen/Android.bp +++ b/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: [ |