From cc4bbdccd3d79eaf94b41ea565f0ea20052c2634 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Tue, 12 Jun 2018 22:59:16 +0000 Subject: [PATCH] Revert "Revert "Move -Wno-enum-compare{,-switch} to external cflags"" This reverts commit 2f71a6adcd0081d93f1d4035f80a4dad4d9325a3. Change-Id: I09abb194b25813b8b1e4470b22171121cc3f8c11 --- cc/config/clang.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cc/config/clang.go b/cc/config/clang.go index 22e428fba..36afc68fd 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", }, " ")) }