diff options
| author | Chih-hung Hsieh <chh@google.com> | 2018-10-25 17:58:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-25 17:58:17 -0700 |
| commit | 51025d638d9a949b2863ad3a56d8b783ec9fc6c4 (patch) | |
| tree | 00583af19fe8c69a8c2501aeb3675070383d2e94 | |
| parent | c18cd05c6f69b028720a5bc66e2b2a361062805a (diff) | |
| parent | 469705cca4939f024808eeb4316cdb134e6d6c2c (diff) | |
Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64 am: 9c5738238d
am: 469705cca4
Change-Id: I4bc5f389495ed535762438632e65ccd6c66f3739
| -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 98af3eb05391..92efb6ba8914 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 fa9ab1f72688..e84156716424 100644 --- a/media/jni/Android.bp +++ b/media/jni/Android.bp @@ -81,6 +81,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: [ |