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

Commit 1aacc6c3 authored by David Srbecky's avatar David Srbecky
Browse files

Fix dump-oat-boot build target. 

Implement support of dumping host boot.art.

That was not possible before because imageLocation is different on host.

This CL makes imageLocation per-variant so can access for the host variant.

Test: m dump-oat-boot
Change-Id: Id82161e4901a6b77f220238aec460b8609fd765f
parent 5e9cf02a

java/dexpreopt.go

+3 −1
Original line number Original line Diff line number Diff line
@@ -155,6 +155,8 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo 
		images = append(images, variant.images)

		images = append(images, variant.images)

		imagesDeps = append(imagesDeps, variant.imagesDeps)

		imagesDeps = append(imagesDeps, variant.imagesDeps)

	}

	}

	// The locations for all Android targets are identical. Pick the first one.

	imageLocations := bootImage.getVariant(targets[0]).imageLocations()





	dexLocation := android.InstallPathToOnDevicePath(ctx, d.installPath)

	dexLocation := android.InstallPathToOnDevicePath(ctx, d.installPath)
@@ -198,7 +200,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo 
		Archs:                   archs,

		Archs:                   archs,

		DexPreoptImages:         images,

		DexPreoptImages:         images,

		DexPreoptImagesDeps:     imagesDeps,

		DexPreoptImagesDeps:     imagesDeps,

		DexPreoptImageLocations: bootImage.imageLocations,

		DexPreoptImageLocations: imageLocations,





		PreoptBootClassPathDexFiles:     dexFiles,

		PreoptBootClassPathDexFiles:     dexFiles,

		PreoptBootClassPathDexLocations: dexLocations,

		PreoptBootClassPathDexLocations: dexLocations,

java/dexpreopt_bootjars.go

+38 −40
Original line number Original line Diff line number Diff line
@@ -28,28 +28,10 @@ func init() { 
	android.RegisterSingletonType("dex_bootjars", dexpreoptBootJarsFactory)

	android.RegisterSingletonType("dex_bootjars", dexpreoptBootJarsFactory)

}

}





// The image "location" is a symbolic path that with multiarchitecture

// support doesn't really exist on the device. Typically it is

// /system/framework/boot.art and should be the same for all supported

// architectures on the device. The concrete architecture specific

// content actually ends up in a "filename" that contains an

// architecture specific directory name such as arm, arm64, x86, x86_64.

//

// Here are some example values for an x86_64 / x86 configuration:

//

// bootImages["x86_64"] = "out/soong/generic_x86_64/dex_bootjars/system/framework/x86_64/boot.art"

// dexpreopt.PathToLocation(bootImages["x86_64"], "x86_64") = "out/soong/generic_x86_64/dex_bootjars/system/framework/boot.art"

//

// bootImages["x86"] = "out/soong/generic_x86_64/dex_bootjars/system/framework/x86/boot.art"

// dexpreopt.PathToLocation(bootImages["x86"])= "out/soong/generic_x86_64/dex_bootjars/system/framework/boot.art"

//

// The location is passed as an argument to the ART tools like dex2oat instead of the real path. The ART tools

// will then reconstruct the real path, so the rules must have a dependency on the real path.



// Target-independent description of pre-compiled boot image.

// Target-independent description of pre-compiled boot image.

type bootImageConfig struct {

type bootImageConfig struct {

	// Whether this image is an extension.

	// If this image is an extension, the image that it extends.

	extension bool

	extends *bootImageConfig





	// Image name (used in directory names and ninja rule names).

	// Image name (used in directory names and ninja rule names).

	name string

	name string
@@ -77,9 +59,6 @@ type bootImageConfig struct { 
	dexPaths     android.WritablePaths // for this image

	dexPaths     android.WritablePaths // for this image

	dexPathsDeps android.WritablePaths // for the dependency images and in this image

	dexPathsDeps android.WritablePaths // for the dependency images and in this image





	// The "locations" of the dependency images and in this image.

	imageLocations []string



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

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

	zip android.WritablePath

	zip android.WritablePath
@@ -125,7 +104,7 @@ func (image bootImageConfig) moduleName(idx int) string { 
	// exists), and the rest are converted to 'name'-<jar>.art.

	// exists), and the rest are converted to 'name'-<jar>.art.

	m := image.modules[idx]

	m := image.modules[idx]

	name := image.stem

	name := image.stem

	if idx != 0 || image.extension {

	if idx != 0 || image.extends != nil {

		name += "-" + stemOf(m)

		name += "-" + stemOf(m)

	}

	}

	return name

	return name
@@ -150,6 +129,24 @@ func (image bootImageConfig) moduleFiles(ctx android.PathContext, dir android.Ou 
	return ret

	return ret

}

}





// The image "location" is a symbolic path that, with multiarchitecture support, doesn't really

// exist on the device. Typically it is /apex/com.android.art/javalib/boot.art and should be the

// same for all supported architectures on the device. The concrete architecture specific files

// actually end up in architecture-specific sub-directory such as arm, arm64, x86, or x86_64.

//

// For example a physical file

// "/apex/com.android.art/javalib/x86/boot.art" has "image location"

// "/apex/com.android.art/javalib/boot.art" (which is not an actual file).

//

// The location is passed as an argument to the ART tools like dex2oat instead of the real path.

// ART tools will then reconstruct the architecture-specific real path.

func (image *bootImageVariant) imageLocations() (imageLocations []string) {

	if image.extends != nil {

		imageLocations = image.extends.getVariant(image.target).imageLocations()

	}

	return append(imageLocations, dexpreopt.PathToLocation(image.images, image.target.Arch.ArchType))

}



func concat(lists ...[]string) []string {

func concat(lists ...[]string) []string {

	var size int

	var size int

	for _, l := range lists {

	for _, l := range lists {
@@ -351,7 +348,7 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant 
		cmd.FlagWithInput("--dirty-image-objects=", global.DirtyImageObjects.Path())

		cmd.FlagWithInput("--dirty-image-objects=", global.DirtyImageObjects.Path())

	}

	}





	if image.extension {

	if image.extends != nil {

		artImage := image.primaryImages

		artImage := image.primaryImages

		cmd.

		cmd.

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

			Flag("--runtime-arg").FlagWithInputList("-Xbootclasspath:", image.dexPathsDeps.Paths(), ":").
@@ -559,7 +556,7 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) { 
			BuiltTool(ctx, "oatdumpd").

			BuiltTool(ctx, "oatdumpd").

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

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

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

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

			FlagWithArg("--image=", strings.Join(image.imageLocations, ":")).Implicits(image.imagesDeps.Paths()).

			FlagWithArg("--image=", strings.Join(image.imageLocations(), ":")).Implicits(image.imagesDeps.Paths()).

			FlagWithOutput("--output=", output).

			FlagWithOutput("--output=", output).

			FlagWithArg("--instruction-set=", arch.String())

			FlagWithArg("--instruction-set=", arch.String())

		rule.Build(pctx, ctx, "dump-oat-boot-"+suffix, "dump oat boot "+arch.String())

		rule.Build(pctx, ctx, "dump-oat-boot-"+suffix, "dump oat boot "+arch.String())
@@ -573,11 +570,8 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) { 
			Text("echo").FlagWithArg("Output in ", output.String())

			Text("echo").FlagWithArg("Output in ", output.String())

		rule.Build(pctx, ctx, "phony-dump-oat-boot-"+suffix, "dump oat boot "+arch.String())

		rule.Build(pctx, ctx, "phony-dump-oat-boot-"+suffix, "dump oat boot "+arch.String())





		// TODO: We need to make imageLocations per-variant to make oatdump work on host.

		if image.target.Os == android.Android {

		allPhonies = append(allPhonies, phony)

		allPhonies = append(allPhonies, phony)

	}

	}

	}





	phony := android.PathForPhony(ctx, "dump-oat-boot")

	phony := android.PathForPhony(ctx, "dump-oat-boot")

	ctx.Build(pctx, android.BuildParams{

	ctx.Build(pctx, android.BuildParams{
@@ -617,20 +611,24 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) { 
		var imageNames []string

		var imageNames []string

		for _, current := range append(d.otherImages, image) {

		for _, current := range append(d.otherImages, image) {

			imageNames = append(imageNames, current.name)

			imageNames = append(imageNames, current.name)

			for _, current := range current.variants {

			imageLocations := []string{}

			for _, variant := range current.variants {

				suffix := ""

				suffix := ""

				if current.target.Os.Class == android.Host {

				if variant.target.Os.Class == android.Host {

					suffix = "_host"

					suffix = "_host"

				}

				}

				sfx := current.name + suffix + "_" + current.target.Arch.ArchType.String()

				sfx := variant.name + suffix + "_" + variant.target.Arch.ArchType.String()

				ctx.Strict("DEXPREOPT_IMAGE_VDEX_BUILT_INSTALLED_"+sfx, current.vdexInstalls.String())

				ctx.Strict("DEXPREOPT_IMAGE_VDEX_BUILT_INSTALLED_"+sfx, variant.vdexInstalls.String())

				ctx.Strict("DEXPREOPT_IMAGE_"+sfx, current.images.String())

				ctx.Strict("DEXPREOPT_IMAGE_"+sfx, variant.images.String())

				ctx.Strict("DEXPREOPT_IMAGE_DEPS_"+sfx, strings.Join(current.imagesDeps.Strings(), " "))

				ctx.Strict("DEXPREOPT_IMAGE_DEPS_"+sfx, strings.Join(variant.imagesDeps.Strings(), " "))

				ctx.Strict("DEXPREOPT_IMAGE_BUILT_INSTALLED_"+sfx, current.installs.String())

				ctx.Strict("DEXPREOPT_IMAGE_BUILT_INSTALLED_"+sfx, variant.installs.String())

				ctx.Strict("DEXPREOPT_IMAGE_UNSTRIPPED_BUILT_INSTALLED_"+sfx, current.unstrippedInstalls.String())

				ctx.Strict("DEXPREOPT_IMAGE_UNSTRIPPED_BUILT_INSTALLED_"+sfx, variant.unstrippedInstalls.String())

				if variant.target.Os == android.Android {

					// The locations for all Android targets are identical. Pick one.

					imageLocations = variant.imageLocations()

				}

			}

			}



			ctx.Strict("DEXPREOPT_IMAGE_LOCATIONS_"+current.name, strings.Join(imageLocations, ":"))

			ctx.Strict("DEXPREOPT_IMAGE_LOCATIONS_"+current.name, strings.Join(current.imageLocations, ":"))

			ctx.Strict("DEXPREOPT_IMAGE_ZIP_"+current.name, current.zip.String())

			ctx.Strict("DEXPREOPT_IMAGE_ZIP_"+current.name, current.zip.String())

		}

		}

		ctx.Strict("DEXPREOPT_IMAGE_NAMES", strings.Join(imageNames, " "))

		ctx.Strict("DEXPREOPT_IMAGE_NAMES", strings.Join(imageNames, " "))

java/dexpreopt_config.go

+1 −5
Original line number Original line Diff line number Diff line
@@ -115,7 +115,6 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
		// ART config for the primary boot image in the ART apex.

		// ART config for the primary boot image in the ART apex.

		// It includes the Core Libraries.

		// It includes the Core Libraries.

		artCfg := bootImageConfig{

		artCfg := bootImageConfig{

			extension:        false,

			name:             artBootImageName,

			name:             artBootImageName,

			stem:             "boot",

			stem:             "boot",

			installSubdir:    artSubdir,

			installSubdir:    artSubdir,
@@ -127,7 +126,7 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
		// Framework config for the boot image extension.

		// Framework config for the boot image extension.

		// It includes framework libraries and depends on the ART config.

		// It includes framework libraries and depends on the ART config.

		frameworkCfg := bootImageConfig{

		frameworkCfg := bootImageConfig{

			extension:        true,

			extends:          &artCfg,

			name:             frameworkBootImageName,

			name:             frameworkBootImageName,

			stem:             "boot",

			stem:             "boot",

			installSubdir:    frameworkSubdir,

			installSubdir:    frameworkSubdir,
@@ -149,8 +148,6 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
			// expands to <stem>.art for primary image and <stem>-<1st module>.art for extension

			// expands to <stem>.art for primary image and <stem>-<1st module>.art for extension

			imageName := c.firstModuleNameOrStem() + ".art"

			imageName := c.firstModuleNameOrStem() + ".art"





			c.imageLocations = []string{c.dir.Join(ctx, "android", c.installSubdir, imageName).String()}



			// The path to bootclasspath dex files needs to be known at module

			// The path to bootclasspath dex files needs to be known at module

			// GenerateAndroidBuildAction time, before the bootclasspath modules have been compiled.

			// GenerateAndroidBuildAction time, before the bootclasspath modules have been compiled.

			// Set up known paths for them, the singleton rules will copy them there.

			// Set up known paths for them, the singleton rules will copy them there.
@@ -182,7 +179,6 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
		for i := range targets {

		for i := range targets {

			frameworkCfg.variants[i].primaryImages = artCfg.variants[i].images

			frameworkCfg.variants[i].primaryImages = artCfg.variants[i].images

		}

		}

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





		return configs

		return configs

	}).(map[string]*bootImageConfig)

	}).(map[string]*bootImageConfig)