Merge "Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"" into main
diff --git a/ui/build/config.go b/ui/build/config.go
index 8336884..b228bb4 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -120,9 +120,6 @@
includeTags []string
sourceRootDirs []string
- productReleaseConfigMaps string
- productReleaseConfigMapsLoaded bool
-
// Data source to write ninja weight list
ninjaWeightListSource NinjaWeightListSource
}
@@ -928,9 +925,6 @@
}
func (c *configImpl) Environment() *Environment {
- if c.productReleaseConfigMapsLoaded {
- c.environ.Set("PRODUCT_RELEASE_CONFIG_MAPS", c.productReleaseConfigMaps)
- }
return c.environ
}
diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go
index 360d0da..efe7478 100644
--- a/ui/build/dumpvars.go
+++ b/ui/build/dumpvars.go
@@ -92,20 +92,6 @@
}
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 @@
"TARGET_BUILD_APPS",
"TARGET_BUILD_UNBUNDLED",
- // Additional release config maps
- "PRODUCT_RELEASE_CONFIG_MAPS",
-
// compiler wrappers set up by make
"CC_WRAPPER",
"CXX_WRAPPER",