summaryrefslogtreecommitdiffstats
path: root/test/Android.run-test.mk
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-03-02 11:53:08 -0800
committerMathieu Chartier <mathieuc@google.com>2015-03-02 13:04:34 -0800
commitcaa0a87185257b5d6f5a0771003d58fcbb9548f6 (patch)
tree0be67791b6e92934e964dd2b66bca3bf70276731 /test/Android.run-test.mk
parent0d1ef55dd46ecd0309f8e9e6b30625cde9473fc8 (diff)
downloadart-caa0a87185257b5d6f5a0771003d58fcbb9548f6.zip
art-caa0a87185257b5d6f5a0771003d58fcbb9548f6.tar.gz
art-caa0a87185257b5d6f5a0771003d58fcbb9548f6.tar.bz2
Fix bad variable expansion
Bug: 19524713 Change-Id: I6537bc650e2690e5902576fd0e5a55142d91182a
Diffstat (limited to 'test/Android.run-test.mk')
-rw-r--r--test/Android.run-test.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index c764414..7f1cfdb 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -580,27 +580,27 @@ define define-test-art-run-test
run_test_options += --no-image
# Add the core dependency. This is required for pre-building.
ifeq ($(1),host)
- prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
+ prereq_rule += $$(HOST_CORE_IMAGE_$$(image_suffix)_no-pic_$(12))
else
- prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
+ prereq_rule += $$(TARGET_CORE_IMAGE_$$(image_suffix)_no-pic_$(12))
endif
else
ifeq ($(9),image)
test_groups += ART_RUN_TEST_$$(uc_host_or_target)_IMAGE_RULES
# Add the core dependency.
ifeq ($(1),host)
- prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
+ prereq_rule += $$(HOST_CORE_IMAGE_$$(image_suffix)_no-pic_$(12))
else
- prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
+ prereq_rule += $$(TARGET_CORE_IMAGE_$$(image_suffix)_no-pic_$(12))
endif
else
ifeq ($(9),picimage)
test_groups += ART_RUN_TEST_$$(uc_host_or_target)_PICIMAGE_RULES
run_test_options += --pic-image
ifeq ($(1),host)
- prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_pic_$(12))
+ prereq_rule += $$(HOST_CORE_IMAGE_$$(image_suffix)_pic_$(12))
else
- prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_pic_$(12))
+ prereq_rule += $$(TARGET_CORE_IMAGE_$$(image_suffix)_pic_$(12))
endif
else
$$(error found $(9) expected $(IMAGE_TYPES))