diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-05-21 16:06:49 +0200 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-21 14:53:16 -0700 |
| commit | c32deb49108348cd0d3e3e2c89a757f044a54471 (patch) | |
| tree | 62c683242cbbf90c49b1ef6fd6550c3e34008ab1 /build/Android.common.mk | |
| parent | d3236731ca6145e0723ce8aab8c6ff634ab021c2 (diff) | |
| download | art-c32deb49108348cd0d3e3e2c89a757f044a54471.zip art-c32deb49108348cd0d3e3e2c89a757f044a54471.tar.gz art-c32deb49108348cd0d3e3e2c89a757f044a54471.tar.bz2 | |
Fix test-art-target-oat for multi target
Avoids running dalvikvm with 32-bit native library. When the primary target is
64-bit, dalvikvm is a symlink to dalvikvm64 which can't load 32-bit native
library.
Bug: 15131102
Change-Id: I29c2f3b5a62b5f507674f3f6d1b9f3f2e5a9de23
Diffstat (limited to 'build/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 3961219..ae54efb 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -147,8 +147,6 @@ ART_TEST_OUT := $(TARGET_OUT_DATA)/art-test 2ND_TARGET_ARCH := $(TARGET_2ND_ARCH) ART_PHONY_TEST_TARGET_SUFFIX := 2ND_ART_PHONY_TEST_TARGET_SUFFIX := -ART_TARGET_BINARY_SUFFIX := -2ND_ART_TARGET_BINARY_SUFFIX := ifdef TARGET_2ND_ARCH art_test_primary_suffix := art_test_secondary_suffix := @@ -156,7 +154,6 @@ ifdef TARGET_2ND_ARCH art_test_primary_suffix := 64 ART_PHONY_TEST_TARGET_SUFFIX := 64 2ND_ART_PHONY_TEST_TARGET_SUFFIX := 32 - ART_TARGET_BINARY_SUFFIX := 64 ART_TARGET_ARCH_32 := $(TARGET_2ND_ARCH) ART_TARGET_ARCH_64 := $(TARGET_ARCH) else |