Various renames following the name change from "Runtime APEX" to "ART APEX".
In particular ANDROID_RUNTIME_ROOT is now ANDROID_ART_ROOT.
Test: Build & boot
Test: art/tools/run-gtests.sh in chroot
Test: art/test/testrunner/testrunner.py --target --64 in chroot
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64 in chroot
Test: art/tools/run-jdwp-tests.sh --mode=device --variant=X64 in chroot
Test: m test-art-host-gtest
Test: art/test/testrunner/testrunner.py --host --64
Test: art/tools/run-jdwp-tests.sh --mode=host
Bug: 135753770
Change-Id: Ia74da964e54cf396d66e9e12ea56da4e9483662a
diff --git a/test/run-test b/test/run-test
index 218c989..2214d6c 100755
--- a/test/run-test
+++ b/test/run-test
@@ -399,14 +399,14 @@
android_root="$1"
run_args+=(--android-root "$1")
shift
- elif [ "x$1" = "x--android-runtime-root" ]; then
+ elif [ "x$1" = "x--android-art-root" ]; then
shift
if [ "x$1" = "x" ]; then
- echo "$0 missing argument to --android-runtime-root" 1>&2
+ echo "$0 missing argument to --android-art-root" 1>&2
usage="yes"
break
fi
- run_args+=(--android-runtime-root "$1")
+ run_args+=(--android-art-root "$1")
shift
elif [ "x$1" = "x--android-tzdata-root" ]; then
shift
@@ -813,8 +813,8 @@
echo " --android-i18n-root [path]"
echo " The path on target for the i18n module root."
echo " (/apex/com.android.i18n by default)."
- echo " --android-runtime-root [path]"
- echo " The path on target for the Android Runtime root."
+ echo " --android-art-root [path]"
+ echo " The path on target for the ART module root."
echo " (/apex/com.android.art by default)."
echo " --android-tzdata-root [path]"
echo " The path on target for the Android Time Zone Data root."