From dc42e20d54f17cbcabb2e8584398566eb66c47c3 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 8 Jul 2014 18:54:42 -0700
Subject: [PATCH] TARGET_OUT_DATA_NATIVE_TESTS now points to
$(TARGET_OUT_DATA)/nativetest64 in 64-bit target
Change-Id: I9a562e79de7ec0f065c90de9ae1b72cbcd7d8c6b
---
tests/Android.build.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index bb00648d4..d4b03960d 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -28,8 +28,8 @@ ifneq ($(findstring LIBRARY, $(build_target)),LIBRARY)
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