Revert "Move -Wno-enum-compare{,-switch} to external cflags"
This reverts commit 96d221f9148e86a1a37ac8b1eb7a2f9079b74a70.
Reason for revert: build breakage for sdk target
Change-Id: I933df62738c08b48d8ae4ea951b2cb4837616c78
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 36afc68..22e428f 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -173,16 +173,19 @@
// this new warning are fixed.
"-Wno-null-pointer-arithmetic",
+ // http://b/72330874 Disable -Wenum-compare until the instances detected by this new
+ // warning are fixed.
+ "-Wno-enum-compare",
+ "-Wno-enum-compare-switch",
+
// Disable c++98-specific warning since Android is not concerned with C++98
// compatibility.
"-Wno-c++98-compat-extra-semi",
}, " "))
- // Extra cflags for projects under external/ directory to disable warnings that are infeasible
- // to fix in all the external projects and their upstream repos.
+ // Extra cflags for projects under external/ directory
pctx.StaticVariable("ClangExtraExternalCflags", strings.Join([]string{
- "-Wno-enum-compare",
- "-Wno-enum-compare-switch",
+ // TODO(yikong): Move -Wno flags here
}, " "))
}