openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Separate storing config for MakeVars from building boot image" am: f356e5a533 

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

Change-Id: I55f26ed260006f9e1cf65c505775b0aac2120c8e
This commit is contained in:
Paul Duffin 2021-05-13 14:24:49 +00:00 committed by Automerger Merge Worker
parent c088ab8e01 f356e5a533
commit eb18e84459
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/dexpreopt_bootjars.go
View File

@ -431,11 +431,15 @@ func (d *dexpreoptBootJars) GenerateSingletonBuildActions(ctx android.SingletonC
defaultImageConfig := defaultBootImageConfig(ctx) defaultImageConfig := defaultBootImageConfig(ctx)
profile := bootImageProfileRule(ctx, defaultImageConfig) profile := bootImageProfileRule(ctx, defaultImageConfig)
// Create the default boot image. d.defaultBootImage = defaultImageConfig
d.defaultBootImage = buildBootImage(ctx, defaultImageConfig, profile) artBootImageConfig := artBootImageConfig(ctx)
d.otherImages = []*bootImageConfig{artBootImageConfig}
// Create the default boot image (build artifacts are accessed via the global boot image config).
buildBootImage(ctx, defaultImageConfig, profile)
// Create boot image for the ART apex (build artifacts are accessed via the global boot image config). // Create boot image for the ART apex (build artifacts are accessed via the global boot image config).
d.otherImages = append(d.otherImages, buildBootImage(ctx, artBootImageConfig(ctx), profile)) buildBootImage(ctx, artBootImageConfig, profile)
} }
// shouldBuildBootImages determines whether boot images should be built. // shouldBuildBootImages determines whether boot images should be built.
@ -503,7 +507,7 @@ func copyBootJarsToPredefinedLocations(ctx android.ModuleContext, bootModules []
} }
// buildBootImage takes a bootImageConfig, creates rules to build it, and returns the image. // buildBootImage takes a bootImageConfig, creates rules to build it, and returns the image.
func buildBootImage(ctx android.SingletonContext, image *bootImageConfig, profile android.WritablePath) *bootImageConfig { func buildBootImage(ctx android.SingletonContext, image *bootImageConfig, profile android.WritablePath) {
var zipFiles android.Paths var zipFiles android.Paths
for _, variant := range image.variants { for _, variant := range image.variants {
files := buildBootImageVariant(ctx, variant, profile) files := buildBootImageVariant(ctx, variant, profile)
@ -522,8 +526,6 @@ func buildBootImage(ctx android.SingletonContext, image *bootImageConfig, profil
rule.Build("zip_"+image.name, "zip "+image.name+" image") rule.Build("zip_"+image.name, "zip "+image.name+" image")
} }
return image
} }
// Generate boot image build rules for a specific target. // Generate boot image build rules for a specific target.