From 2f71a6adcd0081d93f1d4035f80a4dad4d9325a3 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Tue, 12 Jun 2018 04:51:49 +0000 Subject: [PATCH] Revert "Move -Wno-enum-compare{,-switch} to external cflags" This reverts commit 96d221f9148e86a1a37ac8b1eb7a2f9079b74a70. Reason for revert: build breakage for sdk target Change-Id: I933df62738c08b48d8ae4ea951b2cb4837616c78 --- cc/config/clang.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cc/config/clang.go b/cc/config/clang.go index 36afc68fd..22e428fba 100644 --- a/cc/config/clang.go +++ b/cc/config/clang.go @@ -173,16 +173,19 @@ 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 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 }, " ")) }