diff options
| -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="" |