diff options
| author | Ying Wang <wangying@google.com> | 2014-07-08 17:07:36 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-08 18:04:17 -0700 |
| commit | 4b1c95d8d2217d877a0f89c55cb08b3caa243e36 (patch) | |
| tree | 1f8e6f8a48ec08a66b5a263af2ab5f48a8cbafda /core/target_test_internal.mk | |
| parent | af95db033de4808826fde12772a6d33a72dda608 (diff) | |
| download | build_make-4b1c95d8d2217d877a0f89c55cb08b3caa243e36.tar.gz build_make-4b1c95d8d2217d877a0f89c55cb08b3caa243e36.tar.bz2 build_make-4b1c95d8d2217d877a0f89c55cb08b3caa243e36.zip | |
More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.
Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
Diffstat (limited to 'core/target_test_internal.mk')
| -rw-r--r-- | core/target_test_internal.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index 87503ea7cb..95d415989c 100644 --- a/core/target_test_internal.mk +++ b/core/target_test_internal.mk @@ -31,5 +31,5 @@ ifdef LOCAL_MODULE_PATH_64 $(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCAL_MODULE)) endif -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)64/$(LOCAL_MODULE) +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) |