Merge "NFC: Fix implicit fallthrough warning."

am: 30fc8829ed Change-Id: I1837ef1eee710248fde3e7d7c7d9a5101de9a69a
2019-05-09 14:49:49 -07:00
parent 0dd9daed86 30fc8829ed
commit 4c4ac1c2b1
2 changed files with 1 additions and 2 deletions
--- 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:
--- 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: [