commit 95e629448aca7a766441c6ef8be1b2f87679636c
author Nicolas Geoffray <ngeoffray@google.com> Tue Feb 28 12:40:40 2023 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Mar 01 09:47:43 2023 +0000
tree 56b34f62ba641d95f7a19da91a25f8eae4327bd0
parent 5dd14cf9abac978eb98f5518629402365a1920d3

Revert "Remove DEX2OAT_SUFFIX for host 32bits only builds."

This reverts commit 8cb5501b2a7af60d2e63ab6e121c0e7eba3a2043.

Reason for revert: Not fixing the issue and regressing other archs.

Change-Id: I27d4112c38deb9fcf623b23f2622d1aa562184a3

tools/art

diff --git a/tools/art b/tools/art
index 1f3a125..e545fc3 100755
--- a/tools/art
+++ b/tools/art
@@ -324,7 +324,7 @@
 ######################################
 ART_BINARY=dalvikvm
 DEX2OAT_BINARY=dex2oat
-DEX2OAT_TARGET_SUFFIX=""
+DEX2OAT_SUFFIX=""
 DELETE_ANDROID_DATA="no"
 LAUNCH_WRAPPER=
 LIBART=libart.so
@@ -348,11 +348,11 @@
     ;;
   --32)
     ART_BINARY=dalvikvm32
-    DEX2OAT_TARGET_SUFFIX=32
+    DEX2OAT_SUFFIX=32
     ;;
   --64)
     ART_BINARY=dalvikvm64
-    DEX2OAT_TARGET_SUFFIX=64
+    DEX2OAT_SUFFIX=64
     ;;
   -d)
     ;& # Fallthrough
@@ -509,8 +509,8 @@
   exit 1
 fi
 
-DEX2OAT_BINARY_TARGET_PATH=$ANDROID_ART_ROOT/bin/$DEX2OAT_BINARY$DEX2OAT_TARGET_SUFFIX
-DEX2OAT_BINARY_HOST_PATH=$ANDROID_ROOT/bin/$DEX2OAT_BINARY
+DEX2OAT_BINARY_TARGET_PATH=$ANDROID_ART_ROOT/bin/$DEX2OAT_BINARY$DEX2OAT_SUFFIX
+DEX2OAT_BINARY_HOST_PATH=$ANDROID_ROOT/bin/$DEX2OAT_BINARY$DEX2OAT_SUFFIX
 
 if [ -x "$DEX2OAT_BINARY_TARGET_PATH" ]; then
   DEX2OAT_BINARY_PATH="$DEX2OAT_BINARY_TARGET_PATH"