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

Commit 3f9c16af authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Move dumpOatRules to platform_bootclasspath"

parents e084f1d7 f7a5592d

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)

}