Remove conscrypt as a build time dependency of ART.
It's now only required when running tests.
Test: test.py, run-libcore-tests, run-libjdwp-tests
Change-Id: I758c9d419eef7e20884d7fc2b3d82c6bba0c2504
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 998a8df..86e9494 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -493,7 +493,7 @@
$$(call dist-for-goals,$$(gtest_rule),$$(gtest_output):gtest/$$(gtest_suffix))
gtest_exe := $(2)
# Dependencies for all host gtests.
- gtest_deps := $$(HOST_CORE_DEX_LOCATIONS) \
+ gtest_deps := $$(ART_HOST_DEX_DEPENDENCIES) \
$$(HOST_BOOT_IMAGE_JARS) \
$$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libicu_jni$$(ART_HOST_SHLIB_EXTENSION) \
$$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \