Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a5592d authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent 4c094428

java/dexpreopt_bootjars.go

+1 −4
Original line number Diff line number Diff line
@@ -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) {

java/platform_bootclasspath.go

+2 −0
Original line number Diff line number Diff line
@@ -328,4 +328,6 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. 


	// Generate the updatable bootclasspath packages rule.

	generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules)



	dumpOatRules(ctx, imageConfig)

}