aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2018-06-30 00:03:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-06-30 00:03:55 +0000
commitc4151163332b6d87ed8ac370d9d19967cbd26c66 (patch)
tree96288fa5e5a4a4714a8c278deeaca518a9f34282
parentb830e84821ad81247cc85629a74257fbc8062d09 (diff)
parente1e83e427971abe23d61e6502a473934309e586f (diff)
downloadbuild_soong-c4151163332b6d87ed8ac370d9d19967cbd26c66.tar.gz
build_soong-c4151163332b6d87ed8ac370d9d19967cbd26c66.tar.bz2
build_soong-c4151163332b6d87ed8ac370d9d19967cbd26c66.zip
Merge "Revert^6 "Move -Wno-enum-compare{,-switch} to external cflags""
-rw-r--r--cc/config/clang.go11
1 files changed, 4 insertions, 7 deletions
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 22e428fb..36afc68f 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -173,19 +173,16 @@ func init() {
// 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",
}, " "))
}