commit af22c5bd4ad2a1d14e7192ddad5afff86ffafb7f
author Roland Levillain <rpl@google.com> Wed Feb 19 16:24:10 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu May 21 21:25:56 2020 +0000
tree 4515f55012c46cb1e0b13c9f9a1e69843bd4515e
parent 097d93bed93e8afaf9dee43dbc2ef7f0185cad03

Revert "Use 32 or 64 bit dex2oat explicitly depending on HOST_PREFER_32_BIT."

This reverts commit 8aa6a82003ce7ece4511996341021e7084d40b3a.

Reason for revert: Original issue is fixed by
https://android-review.googlesource.com/c/platform/art/+/1239726

Test: art/tools/buildbot-build.sh --host \
        && art/test/testrunner/testrunner.py --host --optimizing \
             -t 640-checker-integer-valueof
Bug: 149749169
Bug: 155861770
Change-Id: I77d2c1c66fb91b079452f29c40dfce26e7224f8a
Merged-In: I77d2c1c66fb91b079452f29c40dfce26e7224f8a
(cherry picked from commit 15c622d385ec46b4fc236b7445d016bc2ad699ef)

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index d1073e8..3701220 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -13,12 +13,6 @@
     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"
@@ -36,8 +30,8 @@
 DEBUGGER_AGENT=""
 WRAP_DEBUGGER_AGENT="n"
 DEV_MODE="n"
-DEX2OAT_NDEBUG_BINARY="dex2oat${DEX2OAT_SUFFIX}"
-DEX2OAT_DEBUG_BINARY="dex2oatd${DEX2OAT_SUFFIX}"
+DEX2OAT_NDEBUG_BINARY="dex2oat"
+DEX2OAT_DEBUG_BINARY="dex2oatd"
 EXPERIMENTAL=""
 FALSE_BIN="false"
 FLAGS=""