From de936474bc9af4f6e063a9faf26b30f6e549d4ca Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Thu, 19 May 2022 20:11:10 +0800 Subject: [PATCH] Rename modulesAddedWall to modulesWarningsAllowed MODULES_ADDED_WALL is deceiving and it actually meant which modules are allowed to have warnings (do not automatically append -Werror flag). Test: presubmit Bug: 233183337 Change-Id: Ibd21e269eba04d01f13026d70a9e34ccb1cf26d7 --- cc/compiler.go | 2 +- cc/makevars.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cc/compiler.go b/cc/compiler.go index 49b6fba42..773a642e2 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -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...) } diff --git a/cc/makevars.go b/cc/makevars.go index 6752f8cde..815443626 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -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))