summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2018-09-06 10:52:49 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-09-06 10:52:49 -0700
commitdeb71ec24a173bb1ec3babbc6621b34d5f622763 (patch)
treef71299c734571758bf924f1c652a53d3836dc75b
parent7a1184d68cdd33245efc9875b237fcef2c9d2c54 (diff)
parentd1a43ce868903839e4e390a66867646c4fcf9479 (diff)
downloadtinyxml-deb71ec24a173bb1ec3babbc6621b34d5f622763.tar.gz
Merge "Suppress -Wimplicit-fallthrough." am: b6963ddc47 am: 180ef32f6f
am: d1a43ce868 Change-Id: I3f3e031dc2e7a717d6bec6beb7815a30ce3d836d
-rw-r--r--Android.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index b3967a5..bf735c4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,10 +14,11 @@ commonSources:= \
tinystr.cpp
commonFlags := \
- -Wno-undefined-bool-conversion \
- -Wno-missing-braces \
- -Wno-logical-op-parentheses \
- -Werror
+ -Wno-implicit-fallthrough \
+ -Wno-logical-op-parentheses \
+ -Wno-missing-braces \
+ -Wno-undefined-bool-conversion \
+ -Werror
# For the device