From 6dd42a8427f1e5485adb82a1fbcf6900d8c317a5 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 9 Jan 2017 10:42:25 -0800 Subject: [PATCH] ART: Change no-image run-test dependency Let the no-image run-test Make configuration depend on the pic image for prebuilding. This is what the run-test/run-test-jar configuration will use. Test: m ART_TEST_RUN_TEST_NO_IMAGE=true test-art-host && rm $ANDROID_HOST_OUT/framework/x86*/* && m ART_TEST_RUN_TEST_NO_IMAGE=true test-art-host Change-Id: I5c02e76d5e51a63416705a58f733135b688158c2 --- test/Android.run-test.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 670b1033e..5baeb82ff 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -1023,10 +1023,11 @@ define define-test-art-run-test test_groups += ART_RUN_TEST_$$(uc_host_or_target)_NO_IMAGE_RULES run_test_options += --no-image # Add the core dependency. This is required for pre-building. + # Use the PIC image, as it is the default in run-test, to match dependencies. ifeq ($(1),host) - prereq_rule += $$(HOST_CORE_IMAGE_$$(image_suffix)_no-pic_$(13)) + prereq_rule += $$(HOST_CORE_IMAGE_$$(image_suffix)_pic_$(13)) else - prereq_rule += $$(TARGET_CORE_IMAGE_$$(image_suffix)_no-pic_$(13)) + prereq_rule += $$(TARGET_CORE_IMAGE_$$(image_suffix)_pic_$(13)) endif else ifeq ($(9),npicimage) -- 2.11.0