Update references to the ART APEX.
Test: Build & boot
Test: atest CtsJniTestCases CtsCompilationTestCases CtsSimpleperfTestCases CtsBionicTestCases
Bug: 135753770
Change-Id: I9635afaf7996407063a0d9ed474b95c0b0e4f890
Merged-In: I9635afaf7996407063a0d9ed474b95c0b0e4f890
diff --git a/tools/art b/tools/art
index ece4fc3..e08a79f 100644
--- a/tools/art
+++ b/tools/art
@@ -432,18 +432,18 @@
# This script is used on host and target (device). However, the (expected)
# default value `ANDROID_RUNTIME_ROOT` is not the same on host and target:
# - on host, `ANDROID_RUNTIME_ROOT` is expected to be
- # "$ANDROID_ROOT/com.android.runtime";
+ # "$ANDROID_ROOT/com.android.art";
# - on target, `ANDROID_RUNTIME_ROOT` is expected to be
- # "/apex/com.android.runtime".
+ # "/apex/com.android.art".
#
# We use the presence/absence of the `$ANDROID_ROOT/../apex` directory to
# determine whether we are on target or host (this is brittle, but simple).
if [ -d "$ANDROID_ROOT/../apex" ]; then
# Target case.
- ANDROID_RUNTIME_ROOT="/apex/com.android.runtime"
+ ANDROID_RUNTIME_ROOT="/apex/com.android.art"
else
# Host case.
- ANDROID_RUNTIME_ROOT="$ANDROID_ROOT/com.android.runtime"
+ ANDROID_RUNTIME_ROOT="$ANDROID_ROOT/com.android.art"
fi
fi