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

Merge "Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-11-02 08:06:39 +00:00 committed by Gerrit Code Review
commit 87706098b0
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/build/config.go
View file

@ -120,9 +120,6 @@ type configImpl struct {
includeTags []string
sourceRootDirs []string
productReleaseConfigMaps string
productReleaseConfigMapsLoaded bool
// Data source to write ninja weight list
ninjaWeightListSource NinjaWeightListSource
}
@ -928,9 +925,6 @@ func (c *configImpl) configureLocale(ctx Context) {
}
func (c *configImpl) Environment() *Environment {
if c.productReleaseConfigMapsLoaded {
c.environ.Set("PRODUCT_RELEASE_CONFIG_MAPS", c.productReleaseConfigMaps)
}
return c.environ
}

17
ui/build/dumpvars.go
View file

@ -92,20 +92,6 @@ func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_
}
defer tool.Finish()
releaseConfigVars := []string{
"PRODUCT_RELEASE_CONFIG_MAPS",
}
if !config.productReleaseConfigMapsLoaded {
// Get the PRODUCT_RELEASE_CONFIG_MAPS for this product, to avoid polluting the environment
// when we run product config to get the rest of the make vars.
config.productReleaseConfigMapsLoaded = true
releaseMapVars, err := dumpMakeVars(ctx, config, goals, releaseConfigVars, false, "")
if err != nil {
ctx.Fatalln("Error getting PRODUCT_RELEASE_CONFIG_MAPS:", err)
}
config.productReleaseConfigMaps = releaseMapVars["PRODUCT_RELEASE_CONFIG_MAPS"]
}
cmd := Command(ctx, config, "dumpvars",
config.PrebuiltBuildTool("ckati"),
"-f", "build/make/core/config.mk",
@ -205,9 +191,6 @@ func runMakeProductConfig(ctx Context, config Config) {
"TARGET_BUILD_APPS",
"TARGET_BUILD_UNBUNDLED",
// Additional release config maps
"PRODUCT_RELEASE_CONFIG_MAPS",
// compiler wrappers set up by make
"CC_WRAPPER",
"CXX_WRAPPER",