Turn on strict checking for C[PP]FLAGS make vars am: b436fdee65

am: fb2eaaf8f2

* commit 'fb2eaaf8f2cf111cf76937bd10e2cf6d5901f122':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: I6467f06c78886700089203f829ad30ede6a222af
This commit is contained in:
Dan Willemsen
2016-05-17 02:08:21 +00:00
committed by android-build-merger

View File

@@ -74,12 +74,12 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod)
ctx.CheckSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ToolchainCflags(),
globalCflags,
toolchain.Cflags(),
}, " "))
ctx.CheckSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ToolchainLdflags(),
toolchain.Ldflags(),
}, " "))
@@ -93,13 +93,13 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod)
ctx.CheckSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ToolchainClangCflags(),
globalClangCflags,
toolchain.ClangCflags(),
clangExtras,
}, " "))
ctx.CheckSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ToolchainClangLdflags(),
toolchain.ClangLdflags(),
clangExtras,