diff options
| author | 2023-04-19 23:42:27 +0900 | |
|---|---|---|
| committer | 2023-05-12 13:34:48 +0000 | |
| commit | f94a791ee1782e901b616a6e91e0556e57a15aca (patch) | |
| tree | 8bad32e627a88d8156efad8ea7b026505b9e4a1c /build/Android.common_path.mk | |
| parent | 35ea7e066db64f4c9c740894d2c428707015a8c0 (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
(cherry picked from https://android-review.googlesource.com/q/commit:28aed97373c3cabc2cdf6e889c0cfa56df4059b3)
Merged-In: Ia10a933bb0cc1985650afa659dbd9f56ee38de71
Change-Id: Ia10a933bb0cc1985650afa659dbd9f56ee38de71
Diffstat (limited to 'build/Android.common_path.mk')
| -rw-r--r-- | build/Android.common_path.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 6231b863f5..cfc60892ae 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -67,7 +67,7 @@ TARGET_CORE_IMG_DEX_FILES := $(foreach jar,$(TARGET_CORE_IMG_JARS),$(call interm # `dexpreopt_bootjars.go` uses a single source of input regardless of variants, so we should use the # same source for `CORE_IMG_JARS` to avoid checksum mismatches on the oat files. HOST_BOOT_IMAGE_JARS := $(foreach jar,$(CORE_IMG_JARS),$(HOST_OUT)/apex/com.android.art/javalib/$(jar).jar) -CORE_IMG_JAR_DIR := $(OUT_DIR)/soong/$(PRODUCT_DEVICE)/dex_artjars_input +CORE_IMG_JAR_DIR := $(OUT_DIR)/soong/dexpreopt_$(TARGET_ARCH)/dex_artjars_input $(HOST_BOOT_IMAGE_JARS): $(HOST_OUT)/apex/com.android.art/javalib/%.jar : $(CORE_IMG_JAR_DIR)/%.jar $(copy-file-to-target) |