commit d17f06d4884e0eed2d6d8e0ed2377b6270de746c
author Stephen Hines <srhines@google.com> Wed May 08 16:37:20 2019 -0700
committer Stephen Hines <srhines@google.com> Wed May 08 16:41:06 2019 -0700
tree d16dc6954f28be2593600ee7163f041782538ebb
parent d22ba181d0b6d6e80dbdce815439f255c2db2e9c

NFC: Fix implicit fallthrough warning.

Bug: http://b/112564944
Test: Builds.
Change-Id: I3cbb6e751b1341ae8a9abcd04bd16c6b81156ff0

tools/aapt/AaptAssets.cpp

diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 3c3edda..672731c 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -301,6 +301,7 @@
                         break;
                     }
                     // This is not alphabetical, so we fall through to variant
+                    [[fallthrough]];
                 case 5:
                 case 6:
                 case 7:

tools/aapt/Android.bp

diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp
index f367397..a594e5b 100644
--- a/tools/aapt/Android.bp
+++ b/tools/aapt/Android.bp
@@ -71,8 +71,6 @@
     cflags: [
         "-Wno-format-y2k",
         "-DSTATIC_ANDROIDFW_FOR_TOOLS",
-        // Allow implicit fallthroughs in AaptAssets.cpp until they are fixed.
-        "-Wno-error=implicit-fallthrough",
     ],
 
     srcs: [