Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f77b2cb5 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

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
parent 772e21ba

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

}
@@ -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

}

ui/build/dumpvars.go

+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",