From ab364fc3b6ab26ddf4f1b4a6bf01b64056a181ef Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Wed, 30 Jan 2019 08:32:57 -0800
Subject: [PATCH] Suppress -Wimplicit-fallthrough in aapt code

AaptAsssets intentinally falls through in a switch statement.
This change adds [[fallthrough]]; to suppress this implicit fallthrough.

frameworks/base/tools/aapt/AaptAssets.cpp:305:17: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
                case 5:
                ^
frameworks/base/tools/aapt/AaptAssets.cpp:305:17: note: insert '[[fallthrough]];' to silence this warning
                case 5:
                ^
                [[fallthrough]];
frameworks/base/tools/aapt/AaptAssets.cpp:305:17: note: insert 'break;' to avoid fall-through
                case 5:
                ^
                break;

Test: make -j aapt
Change-Id: Ia9d2ca3b59eb804e20c6295791f6a19f0f5f63ab
---
 tools/aapt/AaptAssets.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 3c3edda85e4f5..672731cc2939f 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: