tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Rename modulesAddedWall to modulesWarningsAllowed" am: 8e836ba4b7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098612

Change-Id: Ic4d45bffa9df32faacae2dfe83d31ede9b55cc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi Kong 2022-05-20 00:29:10 +00:00 committed by Automerger Merge Worker
commit b2c1ea9749
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cc/compiler.go
View file

@ -589,7 +589,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
addToModuleList(ctx, modulesUsingWnoErrorKey, module)
} else if !inList("-Werror", flags.Local.CFlags) && !inList("-Werror", flags.Local.CppFlags) {
if warningsAreAllowed(ctx.ModuleDir()) {
addToModuleList(ctx, modulesAddedWallKey, module)
addToModuleList(ctx, modulesWarningsAllowedKey, module)
} else {
flags.Local.CFlags = append([]string{"-Werror"}, flags.Local.CFlags...)
}

4
cc/makevars.go
View file

@ -25,7 +25,7 @@ import (
)
var (
modulesAddedWallKey = android.NewOnceKey("ModulesAddedWall")
modulesWarningsAllowedKey = android.NewOnceKey("ModulesWarningsAllowed")
modulesUsingWnoErrorKey = android.NewOnceKey("ModulesUsingWnoError")
modulesMissingProfileFileKey = android.NewOnceKey("ModulesMissingProfileFile")
)
@ -119,7 +119,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("LSDUMP_PATHS", strings.Join(lsdumpPaths, " "))
ctx.Strict("ANDROID_WARNING_ALLOWED_PROJECTS", makeStringOfWarningAllowedProjects())
ctx.Strict("SOONG_MODULES_ADDED_WALL", makeStringOfKeys(ctx, modulesAddedWallKey))
ctx.Strict("SOONG_MODULES_WARNINGS_ALLOWED", makeStringOfKeys(ctx, modulesWarningsAllowedKey))
ctx.Strict("SOONG_MODULES_USING_WNO_ERROR", makeStringOfKeys(ctx, modulesUsingWnoErrorKey))
ctx.Strict("SOONG_MODULES_MISSING_PGO_PROFILE_FILE", makeStringOfKeys(ctx, modulesMissingProfileFileKey))