From f7a5592d3898d376c3f9d346466dcb8e3f1c26f2 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 26 Apr 2021 23:09:15 +0100 Subject: [PATCH] Move dumpOatRules to platform_bootclasspath Bug: 177892522 Test: m oat-dump-boot - test output to make sure that this change does not change the generated files, at least no more than no changes do as the output from this rule is not deterministic. See b/186459873. Change-Id: Ib2b4203d9bb1fd0ee9443aee4e58b54b38b491cf --- java/dexpreopt_bootjars.go | 5 +---- java/platform_bootclasspath.go | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index be14be417..8c6c9e3bd 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -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) { diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 3b27ef6b4..6bf9ea0b8 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -328,4 +328,6 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. // Generate the updatable bootclasspath packages rule. generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules) + + dumpOatRules(ctx, imageConfig) }