diff options
| author | Ying Wang <wangying@google.com> | 2014-07-09 16:15:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-09 14:50:30 +0000 |
| commit | 6cdd0cfd2f279dfb20b9f7cccc963eb9ee91c666 (patch) | |
| tree | 486076b9e0dd6439cea5f0108ecf6154df6e4aab | |
| parent | 3c12ae56f402744d1a446ceef7d20f5ea01025c3 (diff) | |
| parent | dc42e20d54f17cbcabb2e8584398566eb66c47c3 (diff) | |
| download | bionic-6cdd0cfd2f279dfb20b9f7cccc963eb9ee91c666.zip bionic-6cdd0cfd2f279dfb20b9f7cccc963eb9ee91c666.tar.gz bionic-6cdd0cfd2f279dfb20b9f7cccc963eb9ee91c666.tar.bz2 | |
Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target"
| -rw-r--r-- | tests/Android.build.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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 |