diff options
| -rw-r--r-- | build/Android.common.mk | 9 | ||||
| -rw-r--r-- | build/Android.executable.mk | 4 | ||||
| -rw-r--r-- | dalvikvm/Android.mk | 10 | ||||
| -rwxr-xr-x | dexdump/Android.mk | 2 | ||||
| -rwxr-xr-x | dexlist/Android.mk | 2 |
5 files changed, 23 insertions, 4 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 0f756eff2d..6952d691ba 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -20,6 +20,15 @@ ART_ANDROID_COMMON_MK = true ART_TARGET_SUPPORTED_ARCH := arm arm64 mips mips64 x86 x86_64 ART_HOST_SUPPORTED_ARCH := x86 x86_64 +ifneq ($(HOST_OS),darwin) + ART_HOST_SUPPORTED_ARCH := x86 x86_64 +else + # Mac OS doesn't support low-4GB allocation in a 64-bit process. So we won't be able to create + # our heaps. + ART_HOST_SUPPORTED_ARCH := x86 + ART_MULTILIB_OVERRIDE_host := 32 +endif + ART_COVERAGE := false ifeq ($(ART_COVERAGE),true) diff --git a/build/Android.executable.mk b/build/Android.executable.mk index a251c92464..72cf978339 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -127,6 +127,10 @@ define build-art-executable LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH) endif + ifdef ART_MULTILIB_OVERRIDE_$$(art_target_or_host) + art_multilib := $$(ART_MULTILIB_OVERRIDE_$$(art_target_or_host)) + endif + LOCAL_MULTILIB := $$(art_multilib) art_out_binary_name := $$(LOCAL_MODULE) diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index d127d352d8..71e9a283d6 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -66,16 +66,22 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both +ifdef ART_MULTILIB_OVERRIDE_host + LOCAL_MULTILIB := $(ART_MULTILIB_OVERRIDE_host) +endif +ifeq ($(LOCAL_MULTILIB),both) LOCAL_MODULE_STEM_32 := dalvikvm32 LOCAL_MODULE_STEM_64 := dalvikvm64 +endif LOCAL_NATIVE_COVERAGE := $(ART_COVERAGE) include $(BUILD_HOST_EXECUTABLE) - # Create symlink for the primary version target. +ifeq ($(LOCAL_MULTILIB),both) include $(BUILD_SYSTEM)/executable_prefer_symlink.mk -ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)$(ART_PHONY_TEST_HOST_SUFFIX) ifdef 2ND_ART_PHONY_TEST_HOST_SUFFIX ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)$(2ND_ART_PHONY_TEST_HOST_SUFFIX) endif +endif +ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) diff --git a/dexdump/Android.mk b/dexdump/Android.mk index c6b4d47f6d..a208ccf89b 100755 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -50,5 +50,5 @@ LOCAL_C_INCLUDES := $(dexdump_c_includes) LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES += $(dexdump_libraries) LOCAL_MODULE := dexdump2 -LOCAL_MODULE_TAGS := optional +LOCAL_MULTILIB := $(ART_MULTILIB_OVERRIDE_host) include $(BUILD_HOST_EXECUTABLE) diff --git a/dexlist/Android.mk b/dexlist/Android.mk index 988fe03b0c..9fbd8470b8 100755 --- a/dexlist/Android.mk +++ b/dexlist/Android.mk @@ -50,5 +50,5 @@ LOCAL_C_INCLUDES := $(dexlist_c_includes) LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES += $(dexlist_libraries) LOCAL_MODULE := dexlist2 -LOCAL_MODULE_TAGS := optional +LOCAL_MULTILIB := $(ART_MULTILIB_OVERRIDE_host) include $(BUILD_HOST_EXECUTABLE) |