Merge "Use the apex image when the device config asks for it."
am: 56405f8071
Change-Id: I2437500e947c47689eeebc7253b64b41939782eb
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 347bfab..94a8257 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -101,8 +101,9 @@
// not emit the table by default on Android since NDK still uses GNU binutils.
"-faddrsig",
- // -Wimplicit-fallthrough is not enabled by -Wall.
+ // Make implicit fallthrough an error in the future.
"-Wimplicit-fallthrough",
+ "-Wno-error=implicit-fallthrough",
// Help catch common 32/64-bit errors.
"-Werror=int-conversion",