commit 8492996b70b0032ffb223f4406c6418f5ac9958f
author Carl Shapiro <cshapiro@google.com> Fri Jul 22 18:19:58 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Fri Jul 22 18:19:58 2011 -0700
tree 94e0c0fc13d64c80588a961e3db15959ccaeb276
parent 69759eaa6fd4386f1e6d8748052ad221087b3476

Do not assume the .arm hint is part of the source file path.

Change-Id: I31e4d4c3947dd377b4e9df623697976e1b815cf2

build/Android.test.host.mk

diff --git a/build/Android.test.host.mk b/build/Android.test.host.mk
index 67ce272..d440cd1 100644
--- a/build/Android.test.host.mk
+++ b/build/Android.test.host.mk
@@ -26,7 +26,7 @@
 $(foreach file,$(TEST_HOST_SRC_FILES), \
   $(eval include $(CLEAR_VARS)) \
   $(eval LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)) \
-  $(eval LOCAL_MODULE := $(notdir $(file:%.cc=%))) \
+  $(eval LOCAL_MODULE := $(notdir $(basename $(file:%.arm=%)))) \
   $(eval LOCAL_MODULE_TAGS := tests) \
   $(eval LOCAL_SRC_FILES := $(file)) \
   $(eval LOCAL_CFLAGS := $(ART_CFLAGS)) \

build/Android.test.mk

diff --git a/build/Android.test.mk b/build/Android.test.mk
index 1c2a718..908ef20 100644
--- a/build/Android.test.mk
+++ b/build/Android.test.mk
@@ -28,7 +28,7 @@
   $(eval include $(CLEAR_VARS)) \
   $(eval include external/stlport/libstlport.mk) \
   $(eval LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)) \
-  $(eval LOCAL_MODULE := $(notdir $(file:%.cc=%))) \
+  $(eval LOCAL_MODULE := $(notdir $(basename $(file:%.arm=%)))) \
   $(eval LOCAL_MODULE_TAGS := tests) \
   $(eval LOCAL_SRC_FILES := $(file)) \
   $(eval LOCAL_CFLAGS := $(ART_CFLAGS)) \