diff options
| author | Colin Cross <ccross@android.com> | 2014-03-20 12:55:13 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-04-02 19:44:09 +0000 |
| commit | d74754320e4706796ebb1d4b413dc1fede6e4854 (patch) | |
| tree | d4ab7f6af93b8dbc1889e0e1793e91b95df28629 /dex2oat/Android.mk | |
| parent | 0807e7bbbafc4b4e8e7fb1d2d54fbcb011c05c82 (diff) | |
| download | art-d74754320e4706796ebb1d4b413dc1fede6e4854.zip art-d74754320e4706796ebb1d4b413dc1fede6e4854.tar.gz art-d74754320e4706796ebb1d4b413dc1fede6e4854.tar.bz2 | |
force dex2oat target executables to be compiled for 32-bit
64-bit dex2oat doesn't support 32-bit targets yet, force dex2oat
target executables to compile 32-bit for now by passing in a
value for LOCAL_MULTILIB to build-art-executable.
Bug: 13764385
Change-Id: I41adba1e64f373e4b61a3c13af2592ed4f7d0b57
Diffstat (limited to 'dex2oat/Android.mk')
| -rw-r--r-- | dex2oat/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 6cd0538..038f0a7 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) |