diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-10 23:21:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 22:08:45 +0000 |
| commit | aa4e4d8463750a27f391c0381184b01c4b52b7aa (patch) | |
| tree | c1e853993d242833acbc990a2b0d0f5ddb3b8547 | |
| parent | 69d57a89595c7c0fba7b7f7b7c6b431a92137215 (diff) | |
| parent | afdc560ad421d0b699ec5d6723a9155e46d629ae (diff) | |
| download | art-aa4e4d8463750a27f391c0381184b01c4b52b7aa.zip art-aa4e4d8463750a27f391c0381184b01c4b52b7aa.tar.gz art-aa4e4d8463750a27f391c0381184b01c4b52b7aa.tar.bz2 | |
Merge "Fix for test-art-host"
| -rw-r--r-- | build/Android.common.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index aa167b2..a14b951 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -37,7 +37,11 @@ ART_BUILD_TARGET_DEBUG ?= true ART_BUILD_HOST_NDEBUG ?= $(WITH_HOST_DALVIK) ART_BUILD_HOST_DEBUG ?= $(WITH_HOST_DALVIK) +ifeq ($(HOST_PREFER_32_BIT),true) +ART_HOST_ARCH := $(HOST_2ND_ARCH) +else ART_HOST_ARCH := $(HOST_ARCH) +endif ifeq ($(ART_BUILD_TARGET_NDEBUG),false) $(info Disabling ART_BUILD_TARGET_NDEBUG) |