commit 6bf77f3ab4bbeb77c2d953db819b87317be253ea
author Jiyong Park <jiyong@google.com> Thu Jan 31 21:56:40 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 31 21:56:40 2019 -0800
tree 7e1c40a3bfb062972749ea24a6fb91029101a900
parent dd070fb200ad3f664275390b270bc2bff289ee4a
parent 7581398376c8e87cac5532a7044f5ac6efaf2d4d

Merge "Fix: runtime apex is not instrumented with sanitizer" am: 101d7600b2
am: 7581398376

Change-Id: I48a87d35e7779265afb1938f761673608ff91f06

cc/config/clang.go

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",