Merge "soong: move -Wimplicit-fallthrough from cflags to cxxflags" am: 2d5ce8538b

am: 3a24eefedb

Change-Id: I1898c3c87d9fe96f482f911bdcb43dd1fed06c94

cc/config/clang.go

@@ -101,9 +101,6 @@ func init() {
 		// not emit the table by default on Android since NDK still uses GNU binutils.
 		"-faddrsig",
 
-		// -Wimplicit-fallthrough is not enabled by -Wall.
-		"-Wimplicit-fallthrough",
-
 		// Help catch common 32/64-bit errors.
 		"-Werror=int-conversion",
 
@@ -138,6 +135,9 @@ func init() {
 	}, " "))
 
 	pctx.StaticVariable("ClangExtraCppflags", strings.Join([]string{
+		// -Wimplicit-fallthrough is not enabled by -Wall.
+		"-Wimplicit-fallthrough",
+
 		// Enable clang's thread-safety annotations in libcxx.
 		"-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",