diff options
| author | 2014-04-02 20:15:25 +0000 | |
|---|---|---|
| committer | 2014-04-02 20:15:25 +0000 | |
| commit | 40462bcc8b8fbe8a4981a0fb209e10898a118e2c (patch) | |
| tree | 1d4615ae025d667840188b407d4828eae956f0ae | |
| parent | c6829abc118255ed37cdddb643e5276f2e9ff9bd (diff) | |
| parent | d74754320e4706796ebb1d4b413dc1fede6e4854 (diff) | |
Merge "force dex2oat target executables to be compiled for 32-bit"
| -rw-r--r-- | build/Android.executable.mk | 3 | ||||
| -rw-r--r-- | dex2oat/Android.mk | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 88ca47eee0..27d687c529 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -30,6 +30,7 @@ endif # $(4): extra include directories # $(5): target or host # $(6): ndebug or debug +# $(7): value for LOCAL_MULTILIB (empty means default) define build-art-executable ifneq ($(5),target) ifneq ($(5),host) @@ -48,6 +49,7 @@ define build-art-executable art_c_includes := $(4) art_target_or_host := $(5) art_ndebug_or_debug := $(6) + art_multilib := $(7) include $(CLEAR_VARS) ifeq ($$(art_target_or_host),target) @@ -98,6 +100,7 @@ define build-art-executable ifeq ($$(art_target_or_host),target) LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH) + LOCAL_MULTILIB := $$(art_multilib) endif ifeq ($$(art_target_or_host),target) diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 6cd0538c43..038f0a77fd 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -22,10 +22,10 @@ DEX2OAT_SRC_FILES := \ dex2oat.cc ifeq ($(ART_BUILD_TARGET_NDEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler,art/compiler,target,ndebug)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler,art/compiler,target,ndebug,32)) endif ifeq ($(ART_BUILD_TARGET_DEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler,art/compiler,target,debug)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler,art/compiler,target,debug,32)) endif ifeq ($(WITH_HOST_DALVIK),true) |