summaryrefslogtreecommitdiff
path: root/tools/aapt
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2018-10-25 17:58:17 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-25 17:58:17 -0700
commit51025d638d9a949b2863ad3a56d8b783ec9fc6c4 (patch)
tree00583af19fe8c69a8c2501aeb3675070383d2e94 /tools/aapt
parentc18cd05c6f69b028720a5bc66e2b2a361062805a (diff)
parent469705cca4939f024808eeb4316cdb134e6d6c2c (diff)
Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64 am: 9c5738238d
am: 469705cca4 Change-Id: I4bc5f389495ed535762438632e65ccd6c66f3739
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Android.bp2
1 files changed, 2 insertions, 0 deletions
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: [