summaryrefslogtreecommitdiff
path: root/java/dexpreopt_config.go
diff options
context:
space:
mode:
author Jeongik Cha <jeongik@google.com> 2023-04-19 23:25:41 +0900
committer Jeongik Cha <jeongik@google.com> 2023-04-28 11:50:18 +0900
commit4753b39ccaaf573910e6b7a4200e9ca03ec8d96d (patch)
tree3337ee11d3516eff258f0814bd3aa6facef421bc /java/dexpreopt_config.go
parentaea34a38cacf2fdd7fc67fcd5c4a784278d3e01a (diff)
Get rid of DeviceName() from path related to dexpreopt
As-is, dexpreopt config and bootjar is in the dir including DeviceName(). It causes unnecessary dexpreopt invocation when target is changed repeatly. To avoid it, rename dir to common name. Bug: 278833696 Test: m Change-Id: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
Diffstat (limited to 'java/dexpreopt_config.go')
-rw-r--r--java/dexpreopt_config.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 8c62c332a..8f732cf56 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -108,7 +108,8 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig
func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig {
return ctx.Config().Once(bootImageConfigKey, func() interface{} {
targets := dexpreoptTargets(ctx)
- deviceDir := android.PathForOutput(ctx, ctx.Config().DeviceName())
+ archType := ctx.Config().Targets[android.Android][0].Arch.ArchType
+ deviceDir := android.PathForOutput(ctx, toDexpreoptDirName(archType))
configs := genBootImageConfigRaw(ctx)
@@ -220,8 +221,8 @@ var updatableBootConfigKey = android.NewOnceKey("apexBootConfig")
func GetApexBootConfig(ctx android.PathContext) apexBootConfig {
return ctx.Config().Once(updatableBootConfigKey, func() interface{} {
apexBootJars := dexpreopt.GetGlobalConfig(ctx).ApexBootJars
-
- dir := android.PathForOutput(ctx, ctx.Config().DeviceName(), "apex_bootjars")
+ archType := ctx.Config().Targets[android.Android][0].Arch.ArchType
+ dir := android.PathForOutput(ctx, toDexpreoptDirName(archType), "apex_bootjars")
dexPaths := apexBootJars.BuildPaths(ctx, dir)
dexPathsByModuleName := apexBootJars.BuildPathsByModule(ctx, dir)
@@ -261,3 +262,7 @@ func init() {
func dexpreoptConfigMakevars(ctx android.MakeVarsContext) {
ctx.Strict("DEXPREOPT_BOOT_JARS_MODULES", strings.Join(defaultBootImageConfig(ctx).modules.CopyOfApexJarPairs(), ":"))
}
+
+func toDexpreoptDirName(arch android.ArchType) string {
+ return "dexpreopt_" + arch.String()
+}