From 8ad44855e627dc9bf05a3da5b4677de84786c3ce Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Wed, 13 Jun 2018 07:36:05 +0000 Subject: [PATCH] Revert "Revert "Revert "Move -Wno-enum-compare{,-switch} to external cflags""" This reverts commit cc4bbdccd3d79eaf94b41ea565f0ea20052c2634. Reason for revert: breaks builds Change-Id: Ia8908eb372ce46b23aea73283baf37add4477312 --- 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 }, " ")) }