commit 6547ace95d86e0f1aec8a0abc76fe87838a81815
author Carl Shapiro <cshapiro@google.com> Fri Jul 22 22:44:59 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Fri Jul 22 22:44:59 2011 -0700
tree f92bcfede8e3858733589ebfa5b524d964bb794d
parent 51472c555deacd828b2f69063076b29217cb2f70

Ignore the .arm hint in the top-level targets as well.

Change-Id: Idfd62d23bdaf63869999a5086eb636d3b51700f7

Android.mk

diff --git a/Android.mk b/Android.mk
index ee8cce7..d4938ff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,12 +35,12 @@
 .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