diff options
| author | 2020-02-14 22:05:51 +0000 | |
|---|---|---|
| committer | 2020-02-15 00:40:49 +0000 | |
| commit | 8aa6a82003ce7ece4511996341021e7084d40b3a (patch) | |
| tree | 0693a1c8530183e0e88ccfe02ebdc246cae9f70c | |
| parent | e9818ddd70565d52cc1cc93d6991d7e7ec2bc275 (diff) | |
Use 32 or 64 bit dex2oat explicitly depending on HOST_PREFER_32_BIT.
Since dex2oat(d) binaries now always are multilib=both, we need to pick
the right variant explicitly.
Test: lunch sdk-eng && art/tools/buildbot-build.sh --host && \
art/test/run-test --host --optimizing 641-checker-arraycopy
(with and without HOST_PREFER_32_BIT=true)
Bug: 148372405
Change-Id: I7edbff69c3a21d872aa02413718500410c6d1786
| -rwxr-xr-x | test/etc/run-test-jar | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index d593677a84..3684fc34a7 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -13,6 +13,12 @@ msg() { fi } +if [ "$HOST_PREFER_32_BIT" = true ]; then + DEX2OAT_SUFFIX=32 +else + DEX2OAT_SUFFIX=64 +fi + ANDROID_ROOT="/system" ANDROID_ART_ROOT="/apex/com.android.art" ANDROID_I18N_ROOT="/apex/com.android.i18n" @@ -30,8 +36,8 @@ WITH_AGENT=() DEBUGGER_AGENT="" WRAP_DEBUGGER_AGENT="n" DEV_MODE="n" -DEX2OAT_NDEBUG_BINARY="dex2oat" -DEX2OAT_DEBUG_BINARY="dex2oatd" +DEX2OAT_NDEBUG_BINARY="dex2oat${DEX2OAT_SUFFIX}" +DEX2OAT_DEBUG_BINARY="dex2oatd${DEX2OAT_SUFFIX}" EXPERIMENTAL="" FALSE_BIN="false" FLAGS="" |