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

Merge "Move dumpOatRules to platform_bootclasspath"

Browse Source
This commit is contained in:
Paul Duffin
2021-04-29 12:24:34 +00:00
committed by Gerrit Code Review
parent e084f1d717 f7a5592d38
commit 3f9c16af2d
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))
copyUpdatableBootJars(ctx)
dumpOatRules(ctx, d.defaultBootImage)
}
// shouldBuildBootImages determines whether boot images should be built.
@@ -918,7 +916,7 @@ func generateUpdatableBcpPackagesRule(ctx android.ModuleContext, image *bootImag
return updatableBcpPackages
}
func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) {
func dumpOatRules(ctx android.ModuleContext, image *bootImageConfig) {
var allPhonies android.Paths
for _, image := range image.variants {
arch := image.target.Arch.ArchType
@@ -959,7 +957,6 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) {
Inputs: allPhonies,
Description: "dump-oat-boot",
})
}
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.
generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules)
dumpOatRules(ctx, imageConfig)
}