commit 31e0dc244db31fde40e0d6bcbcb7d08e95913564
author Nicolas Geoffray <ngeoffray@google.com> Fri Mar 20 15:48:09 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Mar 24 09:59:18 2020 +0000
tree a67fb3b997ec13e9453e30e47dc666e94a056825
parent 696882f2728dc634fa84d232be11db522727b03c

Remove -testdex variants of bootclasspath jars.

These were used for device testing. Instead use the jars present in the
com.android.art.testing apex and com.android.conscrypt apex.

Test: run-libcore-tests, run-libjdwp-tests, run-tests
Change-Id: I29b5c0e32719ce05783b0860585f54d4a61adcc8

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 4d702e4..9ca4d0f 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -19,7 +19,8 @@
 
 ART_TARGET_SUPPORTED_ARCH := arm arm64 x86 x86_64
 ART_HOST_SUPPORTED_ARCH := x86 x86_64
-ART_DEXPREOPT_BOOT_JAR_DIR := system/framework
+ART_DEXPREOPT_BOOT_JAR_DIR := apex/com.android.art/javalib
+CONSCRYPT_DEXPREOPT_BOOT_JAR_DIR := apex/com.android.conscrypt/javalib
 
 ifneq ($(HOST_OS),darwin)
   ART_HOST_SUPPORTED_ARCH := x86 x86_64