diff options
| author | 2024-09-18 19:08:13 +0000 | |
|---|---|---|
| committer | 2024-09-26 00:33:17 +0000 | |
| commit | b3b758f0cebb1b6ce3a66b8bce12ea77bc8ad342 (patch) | |
| tree | b2dc63499e6016b7c45e590324c69a26191148d6 /build | |
| parent | 9f3192455f075aea6538fa191b106f21ad6b789f (diff) | |
Add `art_boot_images` as required dep of some ART tests
ART gtests and run-tests depend on the host variant of ART boot images, which are
installed in out/host/linux-x86/apex/art_boot_images/
The installation rules for these dexpreopt artifacts were previously
generated by make, but will now be generated by the `art_boot_images`
soong module. This CL adds `art_boot_images` as a required dep of the
relevant gtests and as a phony dep of
`test-art-host-run-test-dependencies`
Bug: 355706080
Test: m installclean && m test-art-host-gtest (gtests)
Test: m installclean && m test-art-host-gtest-art_compiler_tests (single
gtest)
Test: m installclean && m test-art-host-run-test-dependencies && m
art/test.py --host (art run-tests)
Change-Id: I6a4a3ff33f7b909d1487b77709252060d518ca04
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common_path.mk | 2 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 95eeeb430a..bb75398b39 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -65,7 +65,7 @@ HOST_BOOT_IMAGE_JARS += $(HOST_OUT)/apex/com.android.i18n/javalib/core-icu4j.jar $(HOST_OUT)/apex/com.android.i18n/javalib/core-icu4j.jar : $(HOST_OUT_JAVA_LIBRARIES)/core-icu4j-hostdex.jar $(copy-file-to-target) -HOST_CORE_IMG_OUTS += $(HOST_BOOT_IMAGE_JARS) $(HOST_BOOT_IMAGE) $(2ND_HOST_BOOT_IMAGE) +HOST_CORE_IMG_OUTS += $(HOST_BOOT_IMAGE_JARS) HOST_TEST_CORE_JARS := $(addsuffix -hostdex,$(CORE_IMG_JARS) core-icu4j conscrypt) ART_HOST_DEX_DEPENDENCIES := $(foreach jar,$(HOST_TEST_CORE_JARS),$(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index ae40d01db4..fae37a2f76 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -235,11 +235,6 @@ define define-art-gtest-rule-host # * ART_HOST_ARCH := x86_64 # * 2ND_ART_HOST_ARCH := x86 # * 2ND_HOST_ARCH := x86 - ifeq ($(HOST_PREFER_32_BIT),true) - gtest_deps += $$(2ND_HOST_BOOT_IMAGE) # Depend on the 32-bit boot image. - else - gtest_deps += $$($(3)HOST_BOOT_IMAGE) - endif .PHONY: $$(gtest_build_rule) $$(gtest_build_rule) : $$(gtest_exe) $$(gtest_deps) |