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

Commit e4b5342d authored by Hans Boehm's avatar Hans Boehm Committed by Martin Stjernholm
Browse files

Revert "Separate dexpreopt.GlobalSoongConfig to allow independen..." 

Revert submission 1211982-dex2oat-soong-dep

Reason for revert: Build failures. See b/148312086.

Reverted Changes:
Ibc427a9a8: Make dex2oat(d) visible for use as implicit dexpre...
I71df11c1e: Move the Once cache for dexpreopt.GlobalConfig int...
I38317f2d5: Get the dex2oat host tool path from module depende...
I440a09dba: Separate dexpreopt.GlobalSoongConfig to allow inde...

Bug: 148312086
Bug: 145934348
Exempt-From-Owner-Approval: Plain revert
Change-Id: Ice3990225635a737e49e9aed7373f06516fccea3
parent 453bf098

dexpreopt/config.go

+20 −45
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ import ( 
)



// GlobalConfig stores the configuration for dex preopting. The fields are set

// from product variables via dex_preopt_config.mk.

// from product variables via dex_preopt_config.mk, except for SoongConfig

// which come from CreateGlobalSoongConfig.

type GlobalConfig struct {

	DisablePreopt        bool     // disable preopt for all modules

	DisablePreoptModules []string // modules with preopt disabled by product-specific config
@@ -81,6 +82,8 @@ type GlobalConfig struct { 
	BootFlags         string               // extra flags to pass to dex2oat for the boot image

	Dex2oatImageXmx   string               // max heap size for dex2oat for the boot image

	Dex2oatImageXms   string               // initial heap size for dex2oat for the boot image



	SoongConfig GlobalSoongConfig // settings read from dexpreopt_soong.config

}



// GlobalSoongConfig contains the global config that is generated from Soong,
@@ -177,9 +180,11 @@ func constructWritablePath(ctx android.PathContext, path string) android.Writabl 
}



// LoadGlobalConfig reads the global dexpreopt.config file into a GlobalConfig

// struct. LoadGlobalConfig is used directly in Soong and in dexpreopt_gen

// called from Make to read the $OUT/dexpreopt.config written by Make.

func LoadGlobalConfig(ctx android.PathContext, data []byte) (GlobalConfig, error) {

// struct, except the SoongConfig field which is set from the provided

// soongConfig argument. LoadGlobalConfig is used directly in Soong and in

// dexpreopt_gen called from Make to read the $OUT/dexpreopt.config written by

// Make.

func LoadGlobalConfig(ctx android.PathContext, data []byte, soongConfig GlobalSoongConfig) (GlobalConfig, error) {

	type GlobalJSONConfig struct {

		GlobalConfig
@@ -199,6 +204,10 @@ func LoadGlobalConfig(ctx android.PathContext, data []byte) (GlobalConfig, error 
	config.GlobalConfig.DirtyImageObjects = android.OptionalPathForPath(constructPath(ctx, config.DirtyImageObjects))

	config.GlobalConfig.BootImageProfiles = constructPaths(ctx, config.BootImageProfiles)



	// Set this here to force the caller to provide a value for this struct (from

	// either CreateGlobalSoongConfig or LoadGlobalSoongConfig).

	config.GlobalConfig.SoongConfig = soongConfig



	return config.GlobalConfig, nil

}
@@ -244,16 +253,9 @@ func LoadModuleConfig(ctx android.PathContext, data []byte) (ModuleConfig, error 
	return config.ModuleConfig, nil

}



// createGlobalSoongConfig creates a GlobalSoongConfig from the current context.

// CreateGlobalSoongConfig creates a GlobalSoongConfig from the current context.

// Should not be used in dexpreopt_gen.

func createGlobalSoongConfig(ctx android.ModuleContext) GlobalSoongConfig {

	if ctx.Config().TestProductVariables != nil {

		// If we're called in a test there'll be a confusing error from the path

		// functions below that gets reported without a stack trace, so let's panic

		// properly with a more helpful message.

		panic("This should not be called from tests. Please call GlobalSoongConfigForTests somewhere in the test setup.")

	}



func CreateGlobalSoongConfig(ctx android.PathContext) GlobalSoongConfig {

	// Default to debug version to help find bugs.

	// Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.

	var dex2oatBinary string
@@ -274,26 +276,6 @@ func createGlobalSoongConfig(ctx android.ModuleContext) GlobalSoongConfig { 
	}

}



var globalSoongConfigOnceKey = android.NewOnceKey("DexpreoptGlobalSoongConfig")



// GetGlobalSoongConfig creates a GlobalSoongConfig the first time it's called,

// and later returns the same cached instance.

func GetGlobalSoongConfig(ctx android.ModuleContext) GlobalSoongConfig {

	globalSoong := ctx.Config().Once(globalSoongConfigOnceKey, func() interface{} {

		return createGlobalSoongConfig(ctx)

	}).(GlobalSoongConfig)

	return globalSoong

}



// GetCachedGlobalSoongConfig returns a cached GlobalSoongConfig created by an

// earlier GetGlobalSoongConfig call. This function works with any context

// compatible with a basic PathContext, since it doesn't try to create a

// GlobalSoongConfig (which requires a full ModuleContext). It will panic if

// called before the first GetGlobalSoongConfig call.

func GetCachedGlobalSoongConfig(ctx android.PathContext) GlobalSoongConfig {

	return ctx.Config().Get(globalSoongConfigOnceKey).(GlobalSoongConfig)

}



type globalJsonSoongConfig struct {

	Profman          string

	Dex2oat          string
@@ -328,7 +310,7 @@ func LoadGlobalSoongConfig(ctx android.PathContext, data []byte) (GlobalSoongCon 
}



func (s *globalSoongConfigSingleton) GenerateBuildActions(ctx android.SingletonContext) {

	config := GetCachedGlobalSoongConfig(ctx)

	config := CreateGlobalSoongConfig(ctx)

	jc := globalJsonSoongConfig{

		Profman:          config.Profman.String(),

		Dex2oat:          config.Dex2oat.String(),
@@ -355,7 +337,7 @@ func (s *globalSoongConfigSingleton) GenerateBuildActions(ctx android.SingletonC 
}



func (s *globalSoongConfigSingleton) MakeVars(ctx android.MakeVarsContext) {

	config := GetCachedGlobalSoongConfig(ctx)

	config := CreateGlobalSoongConfig(ctx)



	ctx.Strict("DEX2OAT", config.Dex2oat.String())

	ctx.Strict("DEXPREOPT_GEN_DEPS", strings.Join([]string{
@@ -408,14 +390,7 @@ func GlobalConfigForTests(ctx android.PathContext) GlobalConfig { 
		BootFlags:                          "",

		Dex2oatImageXmx:                    "",

		Dex2oatImageXms:                    "",

	}

}



func GlobalSoongConfigForTests(config android.Config) GlobalSoongConfig {

	// Install the test GlobalSoongConfig in the Once cache so that later calls to

	// Get(Cached)GlobalSoongConfig returns it without trying to create a real one.

	return config.Once(globalSoongConfigOnceKey, func() interface{} {

		return GlobalSoongConfig{

		SoongConfig: GlobalSoongConfig{

			Profman:          android.PathForTesting("profman"),

			Dex2oat:          android.PathForTesting("dex2oat"),

			Aapt:             android.PathForTesting("aapt"),
@@ -423,6 +398,6 @@ func GlobalSoongConfigForTests(config android.Config) GlobalSoongConfig { 
			Zip2zip:          android.PathForTesting("zip2zip"),

			ManifestCheck:    android.PathForTesting("manifest_check"),

			ConstructContext: android.PathForTesting("construct_context.sh"),

		},

	}

	}).(GlobalSoongConfig)

}

dexpreopt/dexpreopt.go

+17 −18
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ const SystemOtherPartition = "/system_other/" 


// GenerateDexpreoptRule generates a set of commands that will preopt a module based on a GlobalConfig and a

// ModuleConfig.  The produced files and their install locations will be available through rule.Installs().

func GenerateDexpreoptRule(ctx android.PathContext, globalSoong GlobalSoongConfig,

func GenerateDexpreoptRule(ctx android.PathContext,

	global GlobalConfig, module ModuleConfig) (rule *android.RuleBuilder, err error) {



	defer func() {
@@ -72,10 +72,10 @@ func GenerateDexpreoptRule(ctx android.PathContext, globalSoong GlobalSoongConfi 


	var profile android.WritablePath

	if generateProfile {

		profile = profileCommand(ctx, globalSoong, global, module, rule)

		profile = profileCommand(ctx, global, module, rule)

	}

	if generateBootProfile {

		bootProfileCommand(ctx, globalSoong, global, module, rule)

		bootProfileCommand(ctx, global, module, rule)

	}



	if !dexpreoptDisabled(global, module) {
@@ -87,7 +87,7 @@ func GenerateDexpreoptRule(ctx android.PathContext, globalSoong GlobalSoongConfi 
			generateDM := shouldGenerateDM(module, global)



			for archIdx, _ := range module.Archs {

				dexpreoptCommand(ctx, globalSoong, global, module, rule, archIdx, profile, appImage, generateDM)

				dexpreoptCommand(ctx, global, module, rule, archIdx, profile, appImage, generateDM)

			}

		}

	}
@@ -119,8 +119,8 @@ func dexpreoptDisabled(global GlobalConfig, module ModuleConfig) bool { 
	return false

}



func profileCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, global GlobalConfig,

	module ModuleConfig, rule *android.RuleBuilder) android.WritablePath {

func profileCommand(ctx android.PathContext, global GlobalConfig, module ModuleConfig,

	rule *android.RuleBuilder) android.WritablePath {



	profilePath := module.BuildPath.InSameDir(ctx, "profile.prof")

	profileInstalledPath := module.DexLocation + ".prof"
@@ -131,7 +131,7 @@ func profileCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, glob 


	cmd := rule.Command().

		Text(`ANDROID_LOG_TAGS="*:e"`).

		Tool(globalSoong.Profman)

		Tool(global.SoongConfig.Profman)



	if module.ProfileIsTextListing {

		// The profile is a test listing of classes (used for framework jars).
@@ -158,8 +158,8 @@ func profileCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, glob 
	return profilePath

}



func bootProfileCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, global GlobalConfig,

	module ModuleConfig, rule *android.RuleBuilder) android.WritablePath {

func bootProfileCommand(ctx android.PathContext, global GlobalConfig, module ModuleConfig,

	rule *android.RuleBuilder) android.WritablePath {



	profilePath := module.BuildPath.InSameDir(ctx, "profile.bprof")

	profileInstalledPath := module.DexLocation + ".bprof"
@@ -170,7 +170,7 @@ func bootProfileCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, 


	cmd := rule.Command().

		Text(`ANDROID_LOG_TAGS="*:e"`).

		Tool(globalSoong.Profman)

		Tool(global.SoongConfig.Profman)



	// The profile is a test listing of methods.

	// We need to generate the actual binary profile.
@@ -190,9 +190,8 @@ func bootProfileCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, 
	return profilePath

}



func dexpreoptCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, global GlobalConfig,

	module ModuleConfig, rule *android.RuleBuilder, archIdx int, profile android.WritablePath,

	appImage bool, generateDM bool) {

func dexpreoptCommand(ctx android.PathContext, global GlobalConfig, module ModuleConfig, rule *android.RuleBuilder,

	archIdx int, profile android.WritablePath, appImage bool, generateDM bool) {



	arch := module.Archs[archIdx]
@@ -300,14 +299,14 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, gl 
	if module.EnforceUsesLibraries {

		if module.ManifestPath != nil {

			rule.Command().Text(`target_sdk_version="$(`).

				Tool(globalSoong.ManifestCheck).

				Tool(global.SoongConfig.ManifestCheck).

				Flag("--extract-target-sdk-version").

				Input(module.ManifestPath).

				Text(`)"`)

		} else {

			// No manifest to extract targetSdkVersion from, hope that DexJar is an APK

			rule.Command().Text(`target_sdk_version="$(`).

				Tool(globalSoong.Aapt).

				Tool(global.SoongConfig.Aapt).

				Flag("dump badging").

				Input(module.DexPath).

				Text(`| grep "targetSdkVersion" | sed -n "s/targetSdkVersion:'\(.*\)'/\1/p"`).
@@ -328,7 +327,7 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, gl 
			Implicits(conditionalClassLoaderContextHost29)

		rule.Command().Textf(`conditional_target_libs_29="%s"`,

			strings.Join(conditionalClassLoaderContextTarget29, " "))

		rule.Command().Text("source").Tool(globalSoong.ConstructContext).Input(module.DexPath)

		rule.Command().Text("source").Tool(global.SoongConfig.ConstructContext).Input(module.DexPath)

	}



	// Devices that do not have a product partition use a symlink from /product to /system/product.
@@ -341,7 +340,7 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, gl 


	cmd := rule.Command().

		Text(`ANDROID_LOG_TAGS="*:e"`).

		Tool(globalSoong.Dex2oat).

		Tool(global.SoongConfig.Dex2oat).

		Flag("--avoid-storing-invocation").

		FlagWithOutput("--write-invocation-to=", invocationPath).ImplicitOutput(invocationPath).

		Flag("--runtime-arg").FlagWithArg("-Xms", global.Dex2oatXms).
@@ -410,7 +409,7 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong GlobalSoongConfig, gl 
		dmInstalledPath := pathtools.ReplaceExtension(module.DexLocation, "dm")

		tmpPath := module.BuildPath.InSameDir(ctx, "primary.vdex")

		rule.Command().Text("cp -f").Input(vdexPath).Output(tmpPath)

		rule.Command().Tool(globalSoong.SoongZip).

		rule.Command().Tool(global.SoongConfig.SoongZip).

			FlagWithArg("-L", "9").

			FlagWithOutput("-o", dmPath).

			Flag("-j").

dexpreopt/dexpreopt_gen/dexpreopt_gen.go

+9 −9
Original line number Diff line number Diff line
@@ -80,13 +80,13 @@ func main() { 


	globalSoongConfigData, err := ioutil.ReadFile(*globalSoongConfigPath)

	if err != nil {

		fmt.Fprintf(os.Stderr, "error reading global Soong config %q: %s\n", *globalSoongConfigPath, err)

		fmt.Fprintf(os.Stderr, "error reading global config %q: %s\n", *globalSoongConfigPath, err)

		os.Exit(2)

	}



	globalSoongConfig, err := dexpreopt.LoadGlobalSoongConfig(ctx, globalSoongConfigData)

	if err != nil {

		fmt.Fprintf(os.Stderr, "error loading global Soong config %q: %s\n", *globalSoongConfigPath, err)

		fmt.Fprintf(os.Stderr, "error loading global config %q: %s\n", *globalSoongConfigPath, err)

		os.Exit(2)

	}
@@ -96,9 +96,9 @@ func main() { 
		os.Exit(2)

	}



	globalConfig, err := dexpreopt.LoadGlobalConfig(ctx, globalConfigData)

	globalConfig, err := dexpreopt.LoadGlobalConfig(ctx, globalConfigData, globalSoongConfig)

	if err != nil {

		fmt.Fprintf(os.Stderr, "error loading global config %q: %s\n", *globalConfigPath, err)

		fmt.Fprintf(os.Stderr, "error parse global config %q: %s\n", *globalConfigPath, err)

		os.Exit(2)

	}
@@ -130,12 +130,12 @@ func main() { 
		}

	}()



	writeScripts(ctx, globalSoongConfig, globalConfig, moduleConfig, *dexpreoptScriptPath)

	writeScripts(ctx, globalConfig, moduleConfig, *dexpreoptScriptPath)

}



func writeScripts(ctx android.PathContext, globalSoong dexpreopt.GlobalSoongConfig,

	global dexpreopt.GlobalConfig, module dexpreopt.ModuleConfig, dexpreoptScriptPath string) {

	dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, globalSoong, global, module)

func writeScripts(ctx android.PathContext, global dexpreopt.GlobalConfig, module dexpreopt.ModuleConfig,

	dexpreoptScriptPath string) {

	dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, global, module)

	if err != nil {

		panic(err)

	}
@@ -150,7 +150,7 @@ func writeScripts(ctx android.PathContext, globalSoong dexpreopt.GlobalSoongConf 
		dexpreoptRule.Command().Text("mkdir -p").Flag(filepath.Dir(installPath.String()))

		dexpreoptRule.Command().Text("cp -f").Input(install.From).Output(installPath)

	}

	dexpreoptRule.Command().Tool(globalSoong.SoongZip).

	dexpreoptRule.Command().Tool(global.SoongConfig.SoongZip).

		FlagWithArg("-o ", "$2").

		FlagWithArg("-C ", installDir.String()).

		FlagWithArg("-D ", installDir.String())

dexpreopt/dexpreopt_test.go

+8 −16
Original line number Diff line number Diff line
@@ -61,13 +61,10 @@ func testModuleConfig(ctx android.PathContext, name, partition string) ModuleCon 
}



func TestDexPreopt(t *testing.T) {

	config := android.TestConfig("out", nil, "", nil)

	ctx := android.PathContextForTesting(config)

	globalSoong := GlobalSoongConfigForTests(config)

	global := GlobalConfigForTests(ctx)

	module := testSystemModuleConfig(ctx, "test")

	ctx := android.PathContextForTesting(android.TestConfig("out", nil, "", nil))

	global, module := GlobalConfigForTests(ctx), testSystemModuleConfig(ctx, "test")



	rule, err := GenerateDexpreoptRule(ctx, globalSoong, global, module)

	rule, err := GenerateDexpreoptRule(ctx, global, module)

	if err != nil {

		t.Fatal(err)

	}
@@ -83,9 +80,7 @@ func TestDexPreopt(t *testing.T) { 
}



func TestDexPreoptSystemOther(t *testing.T) {

	config := android.TestConfig("out", nil, "", nil)

	ctx := android.PathContextForTesting(config)

	globalSoong := GlobalSoongConfigForTests(config)

	ctx := android.PathContextForTesting(android.TestConfig("out", nil, "", nil))

	global := GlobalConfigForTests(ctx)

	systemModule := testSystemModuleConfig(ctx, "Stest")

	systemProductModule := testSystemProductModuleConfig(ctx, "SPtest")
@@ -123,7 +118,7 @@ func TestDexPreoptSystemOther(t *testing.T) { 
	for _, test := range tests {

		global.PatternsOnSystemOther = test.patterns

		for _, mt := range test.moduleTests {

			rule, err := GenerateDexpreoptRule(ctx, globalSoong, global, mt.module)

			rule, err := GenerateDexpreoptRule(ctx, global, mt.module)

			if err != nil {

				t.Fatal(err)

			}
@@ -143,15 +138,12 @@ func TestDexPreoptSystemOther(t *testing.T) { 
}



func TestDexPreoptProfile(t *testing.T) {

	config := android.TestConfig("out", nil, "", nil)

	ctx := android.PathContextForTesting(config)

	globalSoong := GlobalSoongConfigForTests(config)

	global := GlobalConfigForTests(ctx)

	module := testSystemModuleConfig(ctx, "test")

	ctx := android.PathContextForTesting(android.TestConfig("out", nil, "", nil))

	global, module := GlobalConfigForTests(ctx), testSystemModuleConfig(ctx, "test")



	module.ProfileClassListing = android.OptionalPathForPath(android.PathForTesting("profile"))



	rule, err := GenerateDexpreoptRule(ctx, globalSoong, global, module)

	rule, err := GenerateDexpreoptRule(ctx, global, module)

	if err != nil {

		t.Fatal(err)

	}

java/dexpreopt.go

+1 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo 
		return dexJarFile

	}



	globalSoong := dexpreopt.GetGlobalSoongConfig(ctx)

	global := dexpreoptGlobalConfig(ctx)

	bootImage := defaultBootImageConfig(ctx)

	if global.UseApexImage {
@@ -190,7 +189,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo 
		PresignedPrebuilt: d.isPresignedPrebuilt,

	}



	dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, globalSoong, global, dexpreoptConfig)

	dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, global, dexpreoptConfig)

	if err != nil {

		ctx.ModuleErrorf("error generating dexpreopt rule: %s", err.Error())

		return dexJarFile