Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NFC: Fix implicit fallthrough warning."

Browse Source 
am: 30fc8829ed

Change-Id: I1837ef1eee710248fde3e7d7c7d9a5101de9a69a
This commit is contained in:
Stephen Hines
2019-05-09 14:49:49 -07:00
committed by android-build-merger
parent 0dd9daed86 30fc8829ed
commit 4c4ac1c2b1
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/aapt/AaptAssets.cpp
View File

@@ -301,6 +301,7 @@ int AaptLocaleValue::initFromDirName(const Vector<String8>& parts, const int sta
break; break;
} }
// This is not alphabetical, so we fall through to variant // This is not alphabetical, so we fall through to variant
[[fallthrough]];
case 5: case 5:
case 6: case 6:
case 7: case 7:

2
tools/aapt/Android.bp
View File

@@ -71,8 +71,6 @@ cc_library_host_static {
cflags: [ cflags: [
"-Wno-format-y2k", "-Wno-format-y2k",
"-DSTATIC_ANDROIDFW_FOR_TOOLS", "-DSTATIC_ANDROIDFW_FOR_TOOLS",
// Allow implicit fallthroughs in AaptAssets.cpp until they are fixed.
"-Wno-error=implicit-fallthrough",
], ],
srcs: [ srcs: [