diff options
| -rw-r--r-- | build/Android.common_path.mk | 2 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 5 | ||||
| -rw-r--r-- | compiler/Android.bp | 1 | ||||
| -rw-r--r-- | dex2oat/Android.bp | 5 | ||||
| -rw-r--r-- | dexoptanalyzer/Android.bp | 1 | ||||
| -rw-r--r-- | imgdiag/Android.bp | 5 | ||||
| -rw-r--r-- | oatdump/Android.bp | 1 | ||||
| -rw-r--r-- | runtime/Android.bp | 5 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 5 |
9 files changed, 19 insertions, 11 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) diff --git a/compiler/Android.bp b/compiler/Android.bp index 05a599cf4a..6409408b02 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -542,6 +542,7 @@ art_cc_defaults { shared_libs: [ "libartd-simulator", ], + required: ["art_boot_images"], }, }, } diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp index ab68831890..093e0c55e3 100644 --- a/dex2oat/Android.bp +++ b/dex2oat/Android.bp @@ -483,7 +483,10 @@ art_cc_defaults { ], target: { host: { - required: ["dex2oatd"], + required: [ + "dex2oatd", + "art_boot_images", + ], }, }, diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp index 06ccfba5ea..62a0003204 100644 --- a/dexoptanalyzer/Android.bp +++ b/dexoptanalyzer/Android.bp @@ -104,6 +104,7 @@ art_cc_defaults { required: [ "dex2oatd", "dexoptanalyzerd", + "art_boot_images", ], }, }, diff --git a/imgdiag/Android.bp b/imgdiag/Android.bp index 2890cc07dd..cb4efa8c49 100644 --- a/imgdiag/Android.bp +++ b/imgdiag/Android.bp @@ -101,7 +101,10 @@ art_cc_test { srcs: ["imgdiag_test.cc"], target: { host: { - required: ["imgdiagd"], + required: [ + "imgdiagd", + "art_boot_images", + ], }, }, } diff --git a/oatdump/Android.bp b/oatdump/Android.bp index ea224bf49f..ce233f8d10 100644 --- a/oatdump/Android.bp +++ b/oatdump/Android.bp @@ -207,6 +207,7 @@ art_cc_defaults { "dex2oatd", "dex2oatds", "dexdump", + "art_boot_images", "oatdumpd", "oatdumpds", ], diff --git a/runtime/Android.bp b/runtime/Android.bp index 0d9009924a..8e76169f6a 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -1139,7 +1139,10 @@ art_cc_test { ], target: { host: { - required: ["dex2oatd"], + required: [ + "dex2oatd", + "art_boot_images", + ], }, }, } diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 42ce1a4d58..f4fdd10ef0 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -71,7 +71,8 @@ ART_TEST_HOST_RUN_TEST_DEPENDENCIES := \ $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmti$(ART_HOST_SHLIB_EXTENSION) \ $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmtid$(ART_HOST_SHLIB_EXTENSION) \ $(ART_HOST_DEX_DEPENDENCIES) \ - $(HOST_I18N_DATA) + $(HOST_I18N_DATA) \ + art_boot_images ifneq ($(HOST_PREFER_32_BIT),true) ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \ @@ -96,7 +97,7 @@ endif test-art-host-run-test-dependencies : \ $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES) $(TEST_ART_RUN_TEST_DEPENDENCIES) \ - $(HOST_BOOT_IMAGE_JARS) $(HOST_BOOT_IMAGE) $(2ND_HOST_BOOT_IMAGE) + $(HOST_BOOT_IMAGE_JARS) .PHONY: test-art-host-run-test-dependencies test-art-run-test-dependencies : test-art-host-run-test-dependencies |