Revert^6 "Move -Wno-enum-compare{,-switch} to external cflags"
This reverts commit c729b508c309cfce45349e62ec11acb8f8d934a9.
Reason for revert: New breakages fixed
(cherry picked from commit e1e83e427971abe23d61e6502a473934309e586f)
Change-Id: Ia5ab5cfbee200d2f73f373da2b5d823072f6e3d8
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 22e428f..36afc68 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -173,19 +173,16 @@
// 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
+ // Extra cflags for projects under external/ directory to disable warnings that are infeasible
+ // to fix in all the external projects and their upstream repos.
pctx.StaticVariable("ClangExtraExternalCflags", strings.Join([]string{
- // TODO(yikong): Move -Wno flags here
+ "-Wno-enum-compare",
+ "-Wno-enum-compare-switch",
}, " "))
}