commit b59f5fba91459ecf58a40b9b240ad99f30305939
author Roland Levillain <rpl@google.com> Wed Feb 19 16:22:48 2020 +0000
committer Roland Levillain <rpl@google.com> Mon Feb 24 14:40:11 2020 +0000
tree d595d072a3c5f41ff9dada08dcc8f1e9341ea083
parent f639bf4c6b542553f727dc1a3262d9a4fd887fe5

Revert "Only append suffixes to dex2oat(d) on host."

This reverts commit f8f51c9697b1f2a41ea750703087e98c46402f08.

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
Change-Id: I2b2561b2889cfff6dce36ec24749953bde3ea733

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 220b7c4..015f87f 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -13,6 +13,12 @@
     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 @@
 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=""
@@ -238,6 +244,10 @@
         shift
     elif [ "x$1" = "x--host" ]; then
         HOST="y"
+        ANDROID_ROOT="${ANDROID_HOST_OUT}"
+        ANDROID_ART_ROOT="${ANDROID_HOST_OUT}/com.android.art"
+        ANDROID_I18N_ROOT="${ANDROID_HOST_OUT}/com.android.i18n"
+        ANDROID_TZDATA_ROOT="${ANDROID_HOST_OUT}/com.android.tzdata"
         shift
     elif [ "x$1" = "x--bionic" ]; then
         BIONIC="y"
@@ -445,20 +455,8 @@
     fi
 done
 
+# HACK: Force the use of `signal_dumper` on host.
 if [[ "$HOST" = "y" ]]; then
-  ANDROID_ROOT="${ANDROID_HOST_OUT}"
-  ANDROID_ART_ROOT="${ANDROID_HOST_OUT}/com.android.art"
-  ANDROID_I18N_ROOT="${ANDROID_HOST_OUT}/com.android.i18n"
-  ANDROID_TZDATA_ROOT="${ANDROID_HOST_OUT}/com.android.tzdata"
-  if [ "$HOST_PREFER_32_BIT" = true ]; then
-    DEX2OAT_HOST_SUFFIX=32
-  else
-    DEX2OAT_HOST_SUFFIX=64
-  fi
-  DEX2OAT_NDEBUG_BINARY="${DEX2OAT_NDEBUG_BINARY}${DEX2OAT_HOST_SUFFIX}"
-  DEX2OAT_DEBUG_BINARY="${DEX2OAT_DEBUG_BINARY}${DEX2OAT_HOST_SUFFIX}"
-
-  # HACK: Force the use of `signal_dumper` on host.
   TIME_OUT="timeout"
 fi