StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"

Browse Source 
Revert submission 2787001-product-build-flags

Reason for revert: Possible cause of b/308849337

Reverted changes: /q/submissionid:2787001-product-build-flags

Bug: 302593603
Bug: 308849337
Change-Id: Id3f27eca8d39e854dee232f072a8dc6c561bac63
This commit is contained in:
Colin Cross
2023-11-02 00:13:30 +00:00
committed by Gerrit Code Review
parent 772e21ba27
commit f77b2cb534
2 changed files with 0 additions and 23 deletions
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 includeTags []string
sourceRootDirs []string sourceRootDirs []string
productReleaseConfigMaps string
productReleaseConfigMapsLoaded bool
// Data source to write ninja weight list // Data source to write ninja weight list
ninjaWeightListSource NinjaWeightListSource ninjaWeightListSource NinjaWeightListSource
} }
@@ -953,9 +950,6 @@ func (c *configImpl) configureLocale(ctx Context) {
} }
func (c *configImpl) Environment() *Environment { func (c *configImpl) Environment() *Environment {
if c.productReleaseConfigMapsLoaded {
c.environ.Set("PRODUCT_RELEASE_CONFIG_MAPS", c.productReleaseConfigMaps)
}
return c.environ 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() 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", cmd := Command(ctx, config, "dumpvars",
config.PrebuiltBuildTool("ckati"), config.PrebuiltBuildTool("ckati"),
"-f", "build/make/core/config.mk", "-f", "build/make/core/config.mk",
@@ -205,9 +191,6 @@ func runMakeProductConfig(ctx Context, config Config) {
"TARGET_BUILD_APPS", "TARGET_BUILD_APPS",
"TARGET_BUILD_UNBUNDLED", "TARGET_BUILD_UNBUNDLED",
// Additional release config maps
"PRODUCT_RELEASE_CONFIG_MAPS",
// compiler wrappers set up by make // compiler wrappers set up by make
"CC_WRAPPER", "CC_WRAPPER",
"CXX_WRAPPER", "CXX_WRAPPER",