From f77b2cb5342d3c9c6e9fc11e68b90a493bdd1bfc Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 2 Nov 2023 00:13:30 +0000
Subject: [PATCH] Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"

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
---
 ui/build/config.go   |  6 ------
 ui/build/dumpvars.go | 17 -----------------
 2 files changed, 23 deletions(-)

diff --git a/ui/build/config.go b/ui/build/config.go
index 84568f802..e581e8fbb 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -120,9 +120,6 @@ type configImpl struct {
 	includeTags    []string
 	sourceRootDirs []string
 
-	productReleaseConfigMaps       string
-	productReleaseConfigMapsLoaded bool
-
 	// Data source to write ninja weight list
 	ninjaWeightListSource NinjaWeightListSource
 }
@@ -953,9 +950,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
 }
 
diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go
index 360d0daf8..efe747819 100644
--- a/ui/build/dumpvars.go
+++ b/ui/build/dumpvars.go
@@ -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",