commit dc42e20d54f17cbcabb2e8584398566eb66c47c3
author Ying Wang <wangying@google.com> Tue Jul 08 18:54:42 2014 -0700
committer Ying Wang <wangying@google.com> Tue Jul 08 18:54:42 2014 -0700
tree 2ab4dbcd640dfc3434dd82cf874b53cfb09e0ee4
parent 006e0770ffaa57d88f407fad8d9b78ea0efa9c6a

TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target

Change-Id: I9a562e79de7ec0f065c90de9ae1b72cbcd7d8c6b

tests/Android.build.mk

diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index bb00648..d4b0396 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -28,8 +28,8 @@
     LOCAL_MODULE_STEM_64 := $(module)64
 else
 ifeq ($($(module)_install_to_out_data),true)
-    LOCAL_MODULE_PATH_32 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(module)
-    LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)64/$(module)
+    LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$(module)
+    LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(module)
 endif
 endif