diff options
| author | 2014-04-16 22:17:24 +0000 | |
|---|---|---|
| committer | 2014-04-16 22:17:24 +0000 | |
| commit | 520ab8768791cf4d51a543023960991c30a75e69 (patch) | |
| tree | 88f73905cfe3c0ab262499da418e19f6c917a322 | |
| parent | 5e17616b7386159cef8f2fb6ffe3cbc4fb1373e4 (diff) | |
| parent | 5a9cef81718465118662b22cfa616457cf91b27a (diff) | |
Merge "Build dex2oat as 64b for the target when using zygote64"
| -rw-r--r-- | dex2oat/Android.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 038f0a77fd..c17788ed9c 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -21,11 +21,19 @@ include art/build/Android.executable.mk DEX2OAT_SRC_FILES := \ dex2oat.cc +# TODO: Remove this when the framework (installd) supports pushing the +# right instruction-set parameter for the primary architecture. +ifneq ($(filter ro.zygote=zygote64,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES)),) + dex2oat_arch := 64 +else + dex2oat_arch := 32 +endif + ifeq ($(ART_BUILD_TARGET_NDEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler,art/compiler,target,ndebug,32)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler,art/compiler,target,ndebug,$(dex2oat_arch))) endif ifeq ($(ART_BUILD_TARGET_DEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler,art/compiler,target,debug,32)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler,art/compiler,target,debug,$(dex2oat_arch))) endif ifeq ($(WITH_HOST_DALVIK),true) |