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

Commit 911083e3 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "Fix --boot-image argument in dex2oat command for boot image extension."

parents 7aa3f766 b0a2d37d

java/dexpreopt_bootjars.go

+4 −1
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ type bootImageConfig struct { 
	images     map[android.ArchType]android.OutputPath  // first image file

	imagesDeps map[android.ArchType]android.OutputPaths // all files



	// Only for extensions, paths to the primary boot images (grouped by target).

	primaryImages map[android.ArchType]android.OutputPath



	// File path to a zip archive with all image files (or nil, if not needed).

	zip android.WritablePath

}
@@ -355,7 +358,7 @@ func buildBootImageRuleForArch(ctx android.SingletonContext, image *bootImage, 
	}



	if image.extension {

		artImage := artBootImageConfig(ctx).images[arch]

		artImage := image.primaryImages[arch]

		cmd.

			Flag("--runtime-arg").FlagWithInputList("-Xbootclasspath:", image.dexPathsDeps.Paths(), ":").

			Flag("--runtime-arg").FlagWithList("-Xbootclasspath-locations:", image.dexLocationsDeps, ":").

java/dexpreopt_config.go

+2 −0
Original line number Diff line number Diff line
@@ -246,10 +246,12 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 


		// specific to the framework config

		frameworkCfg.dexPathsDeps = append(artCfg.dexPathsDeps, frameworkCfg.dexPathsDeps...)

		frameworkCfg.primaryImages = artCfg.images

		frameworkCfg.imageLocations = append(artCfg.imageLocations, frameworkCfg.imageLocations...)



		// specific to the jitzygote-framework config

		frameworkJZCfg.dexPathsDeps = append(artJZCfg.dexPathsDeps, frameworkJZCfg.dexPathsDeps...)

		frameworkJZCfg.primaryImages = artJZCfg.images

		frameworkJZCfg.imageLocations = append(artJZCfg.imageLocations, frameworkJZCfg.imageLocations...)



		return configs