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

Merge "Move dumpOatRules to platform_bootclasspath" am: 3f9c16af2d am: 58da3e8a80

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

Change-Id: I8d86338ade67b51e019b558ab1a38e855654c58e
This commit is contained in:
Paul Duffin
2021-04-29 12:53:04 +00:00
committed by Automerger Merge Worker
parent ae23514b50 58da3e8a80
commit f062acb20b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/dexpreopt_bootjars.go
View File

@@ -438,8 +438,6 @@ func (d *dexpreoptBootJars) GenerateSingletonBuildActions(ctx android.SingletonC
d.otherImages = append(d.otherImages, buildBootImage(ctx, artBootImageConfig(ctx), profile)) d.otherImages = append(d.otherImages, buildBootImage(ctx, artBootImageConfig(ctx), profile))
copyUpdatableBootJars(ctx) copyUpdatableBootJars(ctx)
dumpOatRules(ctx, d.defaultBootImage)
} }
// shouldBuildBootImages determines whether boot images should be built. // shouldBuildBootImages determines whether boot images should be built.
@@ -918,7 +916,7 @@ func generateUpdatableBcpPackagesRule(ctx android.ModuleContext, image *bootImag
return updatableBcpPackages return updatableBcpPackages
} }
func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) { func dumpOatRules(ctx android.ModuleContext, image *bootImageConfig) {
var allPhonies android.Paths var allPhonies android.Paths
for _, image := range image.variants { for _, image := range image.variants {
arch := image.target.Arch.ArchType arch := image.target.Arch.ArchType
@@ -959,7 +957,6 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) {
Inputs: allPhonies, Inputs: allPhonies,
Description: "dump-oat-boot", Description: "dump-oat-boot",
}) })
} }
func writeGlobalConfigForMake(ctx android.SingletonContext, path android.WritablePath) { func writeGlobalConfigForMake(ctx android.SingletonContext, path android.WritablePath) {

2
java/platform_bootclasspath.go
View File

@@ -328,4 +328,6 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android.
// Generate the updatable bootclasspath packages rule. // Generate the updatable bootclasspath packages rule.
generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules) generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules)
dumpOatRules(ctx, imageConfig)
} }