Merge "Revert^4 "Move -Wno-enum-compare{,-switch} to external cflags""

am: e758c83bb5

Change-Id: I16b295a98f503685db2bd4ec1a91b52d93f65ab7
This commit is contained in:
Yi Kong 2018-06-29 00:03:50 -07:00 committed by android-build-merger
commit 71fd304741

View file

@ -173,19 +173,16 @@ func init() {
// this new warning are fixed. // this new warning are fixed.
"-Wno-null-pointer-arithmetic", "-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 // Disable c++98-specific warning since Android is not concerned with C++98
// compatibility. // compatibility.
"-Wno-c++98-compat-extra-semi", "-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{ pctx.StaticVariable("ClangExtraExternalCflags", strings.Join([]string{
// TODO(yikong): Move -Wno flags here "-Wno-enum-compare",
"-Wno-enum-compare-switch",
}, " ")) }, " "))
} }