commit bf03e846536b1b5150bbc419d9adb651ebc4fa06
author Andreas Gampe <agampe@google.com> Wed Oct 29 20:46:17 2014 -0700
committer Andreas Gampe <agampe@google.com> Wed Oct 29 20:46:42 2014 -0700
tree cd98800827a128165eac49449b4952fd3aae3a3d
parent 0ea536897c078761e0309437a3d25fbbf53c94a3

ART: Fix no-image run-test dependency

The tests depend on a core image for prebuilding.

Change-Id: Ib8352a00b61bfcb72b86d42fb8a94e3802ff874d

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index f0eb351..0efd71b 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -554,6 +554,12 @@
   ifeq ($(9),no-image)
     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.
+    ifeq ($(1),host)
+      prereq_rule += $(HOST_CORE_IMAGE_$(4)_no-pic_$(12))
+    else
+      prereq_rule += $(TARGET_CORE_IMAGE_$(4)_no-pic_$(12))
+    endif
   else
     ifeq ($(9),image)
       test_groups += ART_RUN_TEST_$$(uc_host_or_target)_IMAGE_RULES