StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch boot image generation to use GetGlobalSoongConfig(ctx) am: 8fc51a8eb6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1757169

Change-Id: I5cbc7fd0f5046031337afef2ec495088544f2438
This commit is contained in:
Paul Duffin
2021-07-06 14:57:18 +00:00
committed by Automerger Merge Worker
parent 019e278025 8fc51a8eb6
commit 371276f582
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/bootclasspath_fragment.go
View File

@@ -674,10 +674,6 @@ func (b *BootclasspathFragmentModule) produceBootImageFiles(ctx android.ModuleCo
return nil 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. // Only generate the boot image if the configuration does not skip it.
return b.generateBootImageBuildActions(ctx, imageConfig) return b.generateBootImageBuildActions(ctx, imageConfig)
} }

4
java/dexpreopt_bootjars.go
View File

@@ -545,7 +545,7 @@ func buildBootImageZipInPredefinedLocation(ctx android.ModuleContext, image *boo
// Generate boot image build rules for a specific target. // Generate boot image build rules for a specific target.
func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, profile android.Path) { func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, profile android.Path) {
globalSoong := dexpreopt.GetCachedGlobalSoongConfig(ctx) globalSoong := dexpreopt.GetGlobalSoongConfig(ctx)
global := dexpreopt.GetGlobalConfig(ctx) global := dexpreopt.GetGlobalConfig(ctx)
arch := image.target.Arch.ArchType 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.` Rebuild with ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" to see verification errors.`
func bootImageProfileRule(ctx android.ModuleContext, image *bootImageConfig) android.WritablePath { func bootImageProfileRule(ctx android.ModuleContext, image *bootImageConfig) android.WritablePath {
globalSoong := dexpreopt.GetCachedGlobalSoongConfig(ctx) globalSoong := dexpreopt.GetGlobalSoongConfig(ctx)
global := dexpreopt.GetGlobalConfig(ctx) global := dexpreopt.GetGlobalConfig(ctx)
if global.DisableGenerateProfile { if global.DisableGenerateProfile {