Set relative path to ART tests back to `art/$ISA` instead of `test/$ISA`.
This is to address run-test failures. Some of the test logic still
relies on finding test libraries under `/data/nativetest{,64}/art/$ISA`.
This change is a partial revert of 61f071630083775fe64d177455a056daa7071eca.
Test: Run ART run-tests on device
Test: art/build/apex/runtests.sh
Bug: 129534335
Change-Id: I1ce241ff994bfbd789affdcccf360d6f8c62ce61
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0d8c1e3..a9b086a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -79,6 +79,9 @@
# `icu-data-art-test` Make rule.
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/icu)
+# Remove ART test target artifacts.
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/nativetest*/)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 86acfa6..42156a4 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -33,7 +33,7 @@
# tests by architecture is useful on devices supporting more than one
# architecture, as it permits testing all of them using a single Runtime APEX
# package.
-art_test_dir = 'bin/test'
+art_test_dir = 'bin/art'
class FSObject:
def __init__(self, name, is_dir, is_exec, is_symlink, size):
diff --git a/test/Android.bp b/test/Android.bp
index 81c0bc1..2254477 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -19,22 +19,22 @@
host_supported: true,
target: {
android_arm: {
- relative_install_path: "test/arm",
+ relative_install_path: "art/arm",
},
android_arm64: {
- relative_install_path: "test/arm64",
+ relative_install_path: "art/arm64",
},
android_mips: {
- relative_install_path: "test/mips",
+ relative_install_path: "art/mips",
},
android_mips64: {
- relative_install_path: "test/mips64",
+ relative_install_path: "art/mips64",
},
android_x86: {
- relative_install_path: "test/x86",
+ relative_install_path: "art/x86",
},
android_x86_64: {
- relative_install_path: "test/x86_64",
+ relative_install_path: "art/x86_64",
},
darwin: {
enabled: false,