Merge "Fix androidmk module ordering" am: 5f234d565c
am: 127611d062
Change-Id: I460d549f9435ee2255f62f9bec808a3e8fbf1c28
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 6a1c736..4ec787f 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -97,8 +97,9 @@
pctx.StaticVariable("ClangExtraCflags", strings.Join([]string{
"-D__compiler_offsetof=__builtin_offsetof",
- // -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",