Merge "Move dumpOatRules to platform_bootclasspath"
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index be14be4..8c6c9e3 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -438,8 +438,6 @@
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 @@
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 @@
Inputs: allPhonies,
Description: "dump-oat-boot",
})
-
}
func writeGlobalConfigForMake(ctx android.SingletonContext, path android.WritablePath) {
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go
index 3b27ef6..6bf9ea0 100644
--- a/java/platform_bootclasspath.go
+++ b/java/platform_bootclasspath.go
@@ -328,4 +328,6 @@
// Generate the updatable bootclasspath packages rule.
generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules)
+
+ dumpOatRules(ctx, imageConfig)
}