diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 1b2666708..8833bdb70 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -181,11 +181,6 @@ func skipDexpreoptBootJars(ctx android.PathContext) bool { return true } - if len(ctx.Config().Targets[android.Android]) == 0 { - // Host-only build - return true - } - return false } @@ -204,7 +199,10 @@ func DexpreoptedArtApexJars(ctx android.BuilderContext) map[android.ArchType]and // Include dexpreopt files for the primary boot image. files := map[android.ArchType]android.OutputPaths{} for _, variant := range artBootImageConfig(ctx).variants { - files[variant.target.Arch.ArchType] = variant.imagesDeps + // We also generate boot images for host (for testing), but we don't need those in the apex. + if variant.target.Os == android.Android { + files[variant.target.Arch.ArchType] = variant.imagesDeps + } } return files } @@ -362,9 +360,10 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant global := dexpreopt.GetGlobalConfig(ctx) arch := image.target.Arch.ArchType - symbolsDir := image.symbolsDir.Join(ctx, image.installSubdir, arch.String()) + os := image.target.Os.String() // We need to distinguish host-x86 and device-x86. + symbolsDir := image.symbolsDir.Join(ctx, os, image.installSubdir, arch.String()) symbolsFile := symbolsDir.Join(ctx, image.stem+".oat") - outputDir := image.dir.Join(ctx, image.installSubdir, arch.String()) + outputDir := image.dir.Join(ctx, os, image.installSubdir, arch.String()) outputPath := outputDir.Join(ctx, image.stem+".oat") oatLocation := dexpreopt.PathToLocation(outputPath, arch) imagePath := outputPath.ReplaceExtension(ctx, "art") @@ -432,13 +431,18 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant FlagWithArg("--oat-location=", oatLocation). FlagWithArg("--image=", imagePath.String()). FlagWithArg("--instruction-set=", arch.String()). - FlagWithArg("--instruction-set-variant=", global.CpuVariant[arch]). - FlagWithArg("--instruction-set-features=", global.InstructionSetFeatures[arch]). FlagWithArg("--android-root=", global.EmptyDirectory). FlagWithArg("--no-inline-from=", "core-oj.jar"). Flag("--force-determinism"). Flag("--abort-on-hard-verifier-error") + // Use the default variant/features for host builds. + // The map below contains only device CPU info (which might be x86 on some devices). + if image.target.Os == android.Android { + cmd.FlagWithArg("--instruction-set-variant=", global.CpuVariant[arch]) + cmd.FlagWithArg("--instruction-set-features=", global.InstructionSetFeatures[arch]) + } + if global.BootFlags != "" { cmd.Flag(global.BootFlags) } @@ -450,7 +454,6 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant cmd.Textf(`|| ( echo %s ; false )`, proptools.ShellEscape(failureMessage)) installDir := filepath.Join("/", image.installSubdir, arch.String()) - vdexInstallDir := filepath.Join("/", image.installSubdir) var vdexInstalls android.RuleBuilderInstalls var unstrippedInstalls android.RuleBuilderInstalls @@ -469,11 +472,10 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant cmd.ImplicitOutput(vdex) zipFiles = append(zipFiles, vdex) - // The vdex files are identical between architectures, install them to a shared location. The Make rules will - // only use the install rules for one architecture, and will create symlinks into the architecture-specific - // directories. + // Note that the vdex files are identical between architectures. + // Make rules will create symlinks to share them between architectures. vdexInstalls = append(vdexInstalls, - android.RuleBuilderInstall{vdex, filepath.Join(vdexInstallDir, vdex.Base())}) + android.RuleBuilderInstall{vdex, filepath.Join(installDir, vdex.Base())}) } for _, unstrippedOat := range image.moduleFiles(ctx, symbolsDir, ".oat") { @@ -484,7 +486,7 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant android.RuleBuilderInstall{unstrippedOat, filepath.Join(installDir, unstrippedOat.Base())}) } - rule.Build(pctx, ctx, image.name+"JarsDexpreopt_"+arch.String(), "dexpreopt "+image.name+" jars "+arch.String()) + rule.Build(pctx, ctx, image.name+"JarsDexpreopt_"+image.target.String(), "dexpreopt "+image.name+" jars "+arch.String()) // save output and installed files for makevars image.installs = rule.Installs() @@ -657,8 +659,9 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) { var allPhonies android.Paths for _, image := range image.variants { arch := image.target.Arch.ArchType + suffix := image.target.String() // Create a rule to call oatdump. - output := android.PathForOutput(ctx, "boot."+arch.String()+".oatdump.txt") + output := android.PathForOutput(ctx, "boot."+suffix+".oatdump.txt") rule := android.NewRuleBuilder() rule.Command(). // TODO: for now, use the debug version for better error reporting @@ -668,16 +671,16 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) { FlagWithArg("--image=", strings.Join(image.imageLocations, ":")).Implicits(image.imagesDeps.Paths()). FlagWithOutput("--output=", output). FlagWithArg("--instruction-set=", arch.String()) - rule.Build(pctx, ctx, "dump-oat-boot-"+arch.String(), "dump oat boot "+arch.String()) + rule.Build(pctx, ctx, "dump-oat-boot-"+suffix, "dump oat boot "+arch.String()) // Create a phony rule that depends on the output file and prints the path. - phony := android.PathForPhony(ctx, "dump-oat-boot-"+arch.String()) + phony := android.PathForPhony(ctx, "dump-oat-boot-"+suffix) rule = android.NewRuleBuilder() rule.Command(). Implicit(output). ImplicitOutput(phony). Text("echo").FlagWithArg("Output in ", output.String()) - rule.Build(pctx, ctx, "phony-dump-oat-boot-"+arch.String(), "dump oat boot "+arch.String()) + rule.Build(pctx, ctx, "phony-dump-oat-boot-"+suffix, "dump oat boot "+arch.String()) allPhonies = append(allPhonies, phony) } @@ -721,7 +724,11 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) { for _, current := range append(d.otherImages, image) { imageNames = append(imageNames, current.name) for _, current := range current.variants { - sfx := current.name + "_" + current.target.Arch.ArchType.String() + suffix := "" + if current.target.Os.Class == android.Host { + suffix = "_host" + } + sfx := current.name + suffix + "_" + current.target.Arch.ArchType.String() ctx.Strict("DEXPREOPT_IMAGE_VDEX_BUILT_INSTALLED_"+sfx, current.vdexInstalls.String()) ctx.Strict("DEXPREOPT_IMAGE_"+sfx, current.images.String()) ctx.Strict("DEXPREOPT_IMAGE_DEPS_"+sfx, strings.Join(current.imagesDeps.Strings(), " ")) diff --git a/java/dexpreopt_bootjars_test.go b/java/dexpreopt_bootjars_test.go index e7b3c3ba9..127c20159 100644 --- a/java/dexpreopt_bootjars_test.go +++ b/java/dexpreopt_bootjars_test.go @@ -62,7 +62,7 @@ func TestDexpreoptBootJars(t *testing.T) { bootArt := dexpreoptBootJars.Output("boot-foo.art") expectedInputs := []string{ - "dex_artjars/apex/com.android.art/javalib/arm64/boot.art", + "dex_artjars/android/apex/com.android.art/javalib/arm64/boot.art", "dex_bootjars_input/foo.jar", "dex_bootjars_input/bar.jar", "dex_bootjars_input/baz.jar", @@ -81,23 +81,23 @@ func TestDexpreoptBootJars(t *testing.T) { } expectedOutputs := []string{ - "dex_bootjars/system/framework/arm64/boot.invocation", + "dex_bootjars/android/system/framework/arm64/boot.invocation", - "dex_bootjars/system/framework/arm64/boot-foo.art", - "dex_bootjars/system/framework/arm64/boot-bar.art", - "dex_bootjars/system/framework/arm64/boot-baz.art", + "dex_bootjars/android/system/framework/arm64/boot-foo.art", + "dex_bootjars/android/system/framework/arm64/boot-bar.art", + "dex_bootjars/android/system/framework/arm64/boot-baz.art", - "dex_bootjars/system/framework/arm64/boot-foo.oat", - "dex_bootjars/system/framework/arm64/boot-bar.oat", - "dex_bootjars/system/framework/arm64/boot-baz.oat", + "dex_bootjars/android/system/framework/arm64/boot-foo.oat", + "dex_bootjars/android/system/framework/arm64/boot-bar.oat", + "dex_bootjars/android/system/framework/arm64/boot-baz.oat", - "dex_bootjars/system/framework/arm64/boot-foo.vdex", - "dex_bootjars/system/framework/arm64/boot-bar.vdex", - "dex_bootjars/system/framework/arm64/boot-baz.vdex", + "dex_bootjars/android/system/framework/arm64/boot-foo.vdex", + "dex_bootjars/android/system/framework/arm64/boot-bar.vdex", + "dex_bootjars/android/system/framework/arm64/boot-baz.vdex", - "dex_bootjars_unstripped/system/framework/arm64/boot-foo.oat", - "dex_bootjars_unstripped/system/framework/arm64/boot-bar.oat", - "dex_bootjars_unstripped/system/framework/arm64/boot-baz.oat", + "dex_bootjars_unstripped/android/system/framework/arm64/boot-foo.oat", + "dex_bootjars_unstripped/android/system/framework/arm64/boot-bar.oat", + "dex_bootjars_unstripped/android/system/framework/arm64/boot-baz.oat", } for i := range expectedOutputs { diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index f8356d188..ffce2a9ff 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -61,6 +61,10 @@ func dexpreoptTargets(ctx android.PathContext) []android.Target { targets = append(targets, target) } } + // We may also need the images on host in order to run host-based tests. + for _, target := range ctx.Config().Targets[android.BuildOs] { + targets = append(targets, target) + } return targets } @@ -145,7 +149,7 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { // expands to .art for primary image and -<1st module>.art for extension imageName := c.firstModuleNameOrStem() + ".art" - c.imageLocations = []string{c.dir.Join(ctx, c.installSubdir, imageName).String()} + c.imageLocations = []string{c.dir.Join(ctx, "android", c.installSubdir, imageName).String()} // The path to bootclasspath dex files needs to be known at module // GenerateAndroidBuildAction time, before the bootclasspath modules have been compiled. @@ -160,7 +164,7 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { // Create target-specific variants. for _, target := range targets { arch := target.Arch.ArchType - imageDir := c.dir.Join(ctx, c.installSubdir, arch.String()) + imageDir := c.dir.Join(ctx, target.Os.String(), c.installSubdir, arch.String()) variant := &bootImageVariant{ bootImageConfig: c, target: target,