diff options
| author | 2023-04-19 23:42:27 +0900 | |
|---|---|---|
| committer | 2023-05-02 05:07:01 +0000 | |
| commit | 28aed97373c3cabc2cdf6e889c0cfa56df4059b3 (patch) | |
| tree | 831242330625a7788fb152405d7a4a7f97df05ec | |
| parent | 43312d5ee57fcd99ed6e97992b0b146dd6b6db9e (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: Ia10a933bb0cc1985650afa659dbd9f56ee38de71
| -rw-r--r-- | build/Android.common_path.mk | 2 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 2 |
2 files changed, 2 insertions, 2 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) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 11bdf4cc4a..770e988eb5 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -45,7 +45,7 @@ my_files += $(foreach infix,_ _VDEX_,$(foreach suffix,$(HOST_ARCH) $(HOST_2ND_AR # that is used in host gtests, and hence can't lead to checksum mismatches. my_files += \ $(foreach jar,$(CORE_IMG_JARS),\ - $(OUT_DIR)/soong/$(PRODUCT_DEVICE)/dex_artjars_input/$(jar).jar:apex/com.android.art/javalib/$(jar).jar) \ + $(OUT_DIR)/soong/dexpreopt_$(TARGET_ARCH)/dex_artjars_input/$(jar).jar:apex/com.android.art/javalib/$(jar).jar) \ $(HOST_OUT_JAVA_LIBRARIES)/conscrypt-hostdex.jar:apex/com.android.conscrypt/javalib/conscrypt.jar\ $(HOST_OUT_JAVA_LIBRARIES)/core-icu4j-hostdex.jar:apex/com.android.i18n/javalib/core-icu4j.jar \ $(icu_data_file):com.android.i18n/etc/icu/$(notdir $(icu_data_file)) |