Merge "No need to dump modules added -Werror."

This commit is contained in:
Treehugger Robot 2017-12-05 01:09:33 +00:00 committed by Gerrit Code Review
commit 5760c9a12c
2 changed files with 0 additions and 3 deletions

View file

@ -488,7 +488,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
addToModuleList(ctx, modulesAddedWall, module) addToModuleList(ctx, modulesAddedWall, module)
flags.CFlags = append([]string{"-Wall"}, flags.CFlags...) flags.CFlags = append([]string{"-Wall"}, flags.CFlags...)
} else { } else {
addToModuleList(ctx, modulesAddedWerror, module)
flags.CFlags = append([]string{"-Wall", "-Werror"}, flags.CFlags...) flags.CFlags = append([]string{"-Wall", "-Werror"}, flags.CFlags...)
} }
} }

View file

@ -26,7 +26,6 @@ import (
const ( const (
modulesAddedWall = "ModulesAddedWall" modulesAddedWall = "ModulesAddedWall"
modulesAddedWerror = "ModulesAddedWerror"
modulesUsingWnoError = "ModulesUsingWnoError" modulesUsingWnoError = "ModulesUsingWnoError"
) )
@ -102,7 +101,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("ANDROID_WARNING_ALLOWED_PROJECTS", makeStringOfWarningAllowedProjects()) ctx.Strict("ANDROID_WARNING_ALLOWED_PROJECTS", makeStringOfWarningAllowedProjects())
ctx.Strict("SOONG_MODULES_ADDED_WALL", makeStringOfKeys(ctx, modulesAddedWall)) ctx.Strict("SOONG_MODULES_ADDED_WALL", makeStringOfKeys(ctx, modulesAddedWall))
ctx.Strict("SOONG_MODULES_ADDED_WERROR", makeStringOfKeys(ctx, modulesAddedWerror))
ctx.Strict("SOONG_MODULES_USING_WNO_ERROR", makeStringOfKeys(ctx, modulesUsingWnoError)) ctx.Strict("SOONG_MODULES_USING_WNO_ERROR", makeStringOfKeys(ctx, modulesUsingWnoError))
ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(asanCflags, " ")) ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(asanCflags, " "))