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

Commit 8fc51a8e authored by Paul Duffin's avatar Paul Duffin
Browse files

Switch boot image generation to use GetGlobalSoongConfig(ctx) 

Previously, boot image generation used GetCachedGlobalSoongConfig(ctx)
in order to get access to the GlobalSoongConfig. That required that
some other part of the code had called GetGlobalSoongConfig(ctx) to
initialize the cached value. That was left over from when the boot
image generation was done in a singleton which could not call
GetGlobalSoongConfig(ctx) directly. That is no longer true.

This change switches the uses of GetCachedGlobalSoongConfig(ctx) to
GetGlobalSoongConfig(ctx) and removes the now unnecessary call to
GetGlobalSoongConfig(ctx) from outside the functions.

Bug: 192575099
Test: m nothing
Change-Id: I34b7b1526d072d8b09fda7caa96e381695888e16
parent 452decbd

java/bootclasspath_fragment.go

+0 −4
Original line number Diff line number Diff line
@@ -674,10 +674,6 @@ func (b *BootclasspathFragmentModule) produceBootImageFiles(ctx android.ModuleCo 
		return nil

	}



	// Force the GlobalSoongConfig to be created and cached for use by the dex_bootjars

	// GenerateSingletonBuildActions method as it cannot create it for itself.

	dexpreopt.GetGlobalSoongConfig(ctx)



	// Only generate the boot image if the configuration does not skip it.

	return b.generateBootImageBuildActions(ctx, imageConfig)

}

java/dexpreopt_bootjars.go

+2 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ func buildBootImageZipInPredefinedLocation(ctx android.ModuleContext, image *boo 
// Generate boot image build rules for a specific target.

func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, profile android.Path) {



	globalSoong := dexpreopt.GetCachedGlobalSoongConfig(ctx)

	globalSoong := dexpreopt.GetGlobalSoongConfig(ctx)

	global := dexpreopt.GetGlobalConfig(ctx)



	arch := image.target.Arch.ArchType
@@ -696,7 +696,7 @@ It is likely that the boot classpath is inconsistent. 
Rebuild with ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" to see verification errors.`



func bootImageProfileRule(ctx android.ModuleContext, image *bootImageConfig) android.WritablePath {

	globalSoong := dexpreopt.GetCachedGlobalSoongConfig(ctx)

	globalSoong := dexpreopt.GetGlobalSoongConfig(ctx)

	global := dexpreopt.GetGlobalConfig(ctx)



	if global.DisableGenerateProfile {