summaryrefslogtreecommitdiff
path: root/tools/aapt
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2019-05-08 16:37:20 -0700
committerStephen Hines <srhines@google.com>2019-05-08 16:41:06 -0700
commitd17f06d4884e0eed2d6d8e0ed2377b6270de746c (patch)
treed16dc6954f28be2593600ee7163f041782538ebb /tools/aapt
parentd22ba181d0b6d6e80dbdce815439f255c2db2e9c (diff)
NFC: Fix implicit fallthrough warning.
Bug: http://b/112564944 Test: Builds. Change-Id: I3cbb6e751b1341ae8a9abcd04bd16c6b81156ff0
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/AaptAssets.cpp1
-rw-r--r--tools/aapt/Android.bp2
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 3c3edda85e4f..672731cc2939 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -301,6 +301,7 @@ int AaptLocaleValue::initFromDirName(const Vector<String8>& parts, const int sta
break;
}
// This is not alphabetical, so we fall through to variant
+ [[fallthrough]];
case 5:
case 6:
case 7:
diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp
index f36739730775..a594e5bf0ce1 100644
--- a/tools/aapt/Android.bp
+++ b/tools/aapt/Android.bp
@@ -71,8 +71,6 @@ 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: [