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/envsetup.mk | |
| parent | af95db033de4808826fde12772a6d33a72dda608 (diff) | |
| download | build-4b1c95d8d2217d877a0f89c55cb08b3caa243e36.zip build-4b1c95d8d2217d877a0f89c55cb08b3caa243e36.tar.gz build-4b1c95d8d2217d877a0f89c55cb08b3caa243e36.tar.bz2 | |
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/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 9caf7c0..d0b5846 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -72,19 +72,13 @@ endif ifeq (,$(BUILD_HOST_64bit)) # Default to 32-bit-by-default multilib host build. HOST_PREFER_32_BIT := true -ifeq ($(HOST_PREFER_32_BIT),true) -BUILD_HOST_64bit := true -endif endif # HOST_ARCH ifneq (,$(findstring x86_64,$(UNAME))) HOST_ARCH := x86_64 HOST_2ND_ARCH := x86 -else ifneq (,$(findstring 86,$(UNAME))) - # It's not officially supported! - HOST_ARCH := x86 - HOST_2ND_ARCH := + HOST_IS_64_BIT := true endif ifeq ($(HOST_PREFER_32_BIT),true) @@ -170,6 +164,9 @@ board_config_mk := TARGET_OS := linux # TARGET_ARCH should be set by BoardConfig.mk and will be checked later +ifneq ($(filter %64,$(TARGET_ARCH)),) +TARGET_IS_64_BIT := true +endif # the target build type defaults to release ifneq ($(TARGET_BUILD_TYPE),debug) @@ -218,11 +215,7 @@ OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin -ifeq (x86_64,$(HOST_ARCH)) HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64 -else -HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib -endif HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon @@ -258,7 +251,7 @@ TARGET_OUT_COMMON_GEN := $(TARGET_COMMON_OUT_ROOT)/gen TARGET_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM) TARGET_OUT_EXECUTABLES := $(TARGET_OUT)/bin TARGET_OUT_OPTIONAL_EXECUTABLES := $(TARGET_OUT)/xbin -ifneq ($(filter %64,$(TARGET_ARCH)),) +ifeq ($(TARGET_IS_64_BIT),true) # /system/lib always contains 32-bit libraries, # and /system/lib64 (if present) always contains 64-bit libraries. TARGET_OUT_SHARED_LIBRARIES := $(TARGET_OUT)/lib64 @@ -292,19 +285,24 @@ TARGET_OUT_DATA_APPS := $(TARGET_OUT_DATA)/app TARGET_OUT_DATA_KEYLAYOUT := $(TARGET_OUT_KEYLAYOUT) TARGET_OUT_DATA_KEYCHARS := $(TARGET_OUT_KEYCHARS) TARGET_OUT_DATA_ETC := $(TARGET_OUT_ETC) +ifeq ($(TARGET_IS_64_BIT),true) +TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest64 +else TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest +endif TARGET_OUT_DATA_FAKE := $(TARGET_OUT_DATA)/fake_packages $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_DATA_EXECUTABLES) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_SHARED_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_APPS := $(TARGET_OUT_DATA_APPS) +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache TARGET_OUT_VENDOR := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR) TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR)/bin TARGET_OUT_VENDOR_OPTIONAL_EXECUTABLES := $(TARGET_OUT_VENDOR)/xbin -ifneq ($(filter %64,$(TARGET_ARCH)),) +ifeq ($(TARGET_IS_64_BIT),true) TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib64 else TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib |