Merge "Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"" into main (87706098) · Commits · e / os / android_build_soong

ui/build/config.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -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
		}

+0 −17

Original line number	Diff line number	Diff line
		@@ -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",