Build and install the Testing Runtime APEX in ART device testing.
Replace the Debug Runtime APEX with the Testing Runtime APEX for ART
device testing.
This change does not change the behavior of ART device testing per se,
as test rules have not been updated (yet) to make use of the
additional files (ART gtests) included only in the Testing Runtime
APEX.
Test: ART (chroot-based) device testing
Bug: 129534335
Change-Id: I1b9dfcb9fe483584b4065908c1b2e24d19703b52
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 6f182b1..7b9c083 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -25,11 +25,11 @@
$(HOST_OUT_EXECUTABLES)/jasmin \
$(HOST_OUT_EXECUTABLES)/smali
-# We need the Debug Runtime APEX (which is a superset of the Release
-# Runtime APEX) -- which contains dex2oat and dalvikvm and their
-# dependencies -- on the target, as well as the core images (all images
-# as we sync only once).
-ART_TEST_TARGET_RUN_TEST_DEPENDENCIES := $(DEBUG_RUNTIME_APEX) $(TARGET_CORE_IMG_OUTS)
+# We need the Testing Runtime APEX (which is a superset of the Release
+# and Debug Runtime APEXes) -- which contains dex2oat, dalvikvm, their
+# dependencies and ART gtests -- on the target, as well as the core
+# images (all images as we sync only once).
+ART_TEST_TARGET_RUN_TEST_DEPENDENCIES := $(TESTING_RUNTIME_APEX) $(TARGET_CORE_IMG_OUTS)
# Also need libartagent.
ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += libartagent-target libartagentd-target