diff options
| author | Andreas Gampe <agampe@google.com> | 2014-03-12 10:59:26 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-12 10:59:26 -0700 |
| commit | 922141ac9a0ffd4888583aa6c6a06aadc016cdb8 (patch) | |
| tree | 7758c45fb7454cdaf4ad4a5069d5ffc41fa725fb /build/Android.common.mk | |
| parent | b4ebf6bc002560d967ec0f843732f22bf099ba5b (diff) | |
| download | art-922141ac9a0ffd4888583aa6c6a06aadc016cdb8.zip art-922141ac9a0ffd4888583aa6c6a06aadc016cdb8.tar.gz art-922141ac9a0ffd4888583aa6c6a06aadc016cdb8.tar.bz2 | |
Fixed and refactored 64b host build
Add a global variable ART_HOST_ARCH in build/Android.common.mk that
will be set to x86 or x86_64 depending on BUILD_HOST_64bit. This is
then used as the instruction set for dex2oat.
Change-Id: Icec8ef9139f780314a3ff325a729750e65d6d8da
Diffstat (limited to 'build/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index f22eb37..30f730c 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -37,6 +37,12 @@ ART_BUILD_TARGET_DEBUG ?= true ART_BUILD_HOST_NDEBUG ?= $(WITH_HOST_DALVIK) ART_BUILD_HOST_DEBUG ?= $(WITH_HOST_DALVIK) +ifeq ($(BUILD_HOST_64bit),) +ART_HOST_ARCH := x86 +else +ART_HOST_ARCH := x86_64 +endif + ifeq ($(ART_BUILD_TARGET_NDEBUG),false) $(info Disabling ART_BUILD_TARGET_NDEBUG) endif |