summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-07-22 22:44:59 -0700
committerCarl Shapiro <cshapiro@google.com>2011-07-22 22:44:59 -0700
commit6547ace95d86e0f1aec8a0abc76fe87838a81815 (patch)
treef92bcfede8e3858733589ebfa5b524d964bb794d /Android.mk
parent51472c555deacd828b2f69063076b29217cb2f70 (diff)
downloadart-6547ace95d86e0f1aec8a0abc76fe87838a81815.zip
art-6547ace95d86e0f1aec8a0abc76fe87838a81815.tar.gz
art-6547ace95d86e0f1aec8a0abc76fe87838a81815.tar.bz2
Ignore the .arm hint in the top-level targets as well.
Change-Id: Idfd62d23bdaf63869999a5086eb636d3b51700f7
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index ee8cce7..d4938ff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,12 +35,12 @@ endif
.PHONY: build-art
build-art: \
$(TARGET_OUT_EXECUTABLES)/aexec \
- $(foreach file,$(TEST_TARGET_SRC_FILES),$(TARGET_OUT_EXECUTABLES)/$(notdir $(file:%.cc=%))) \
+ $(foreach file,$(TEST_TARGET_SRC_FILES),$(TARGET_OUT_EXECUTABLES)/$(notdir $(basename $(file:%.arm=%)))) \
$(HOST_OUT_EXECUTABLES)/aexec \
- $(foreach file,$(TEST_HOST_SRC_FILES),$(HOST_OUT_EXECUTABLES)/$(notdir $(file:%.cc=%))) \
+ $(foreach file,$(TEST_HOST_SRC_FILES),$(HOST_OUT_EXECUTABLES)/$(notdir $(basename $(file:%.arm=%)))) \
#
# "mm test-art-host" to build and run all host tests
.PHONY: test-art-host
-test-art-host: $(foreach file,$(TEST_HOST_SRC_FILES),$(HOST_OUT_EXECUTABLES)/$(notdir $(file:%.cc=%)))
- $(foreach file,$(TEST_HOST_SRC_FILES),$(HOST_OUT_EXECUTABLES)/$(notdir $(file:%.cc=%)) &&) true
+test-art-host: $(foreach file,$(TEST_HOST_SRC_FILES),$(HOST_OUT_EXECUTABLES)/$(notdir $(basename $(file:%.arm=%))))
+ $(foreach file,$(TEST_HOST_SRC_FILES),$(HOST_OUT_EXECUTABLES)/$(notdir $(basename $(file:%.arm=%))) &&) true