Add core-simple to the standard boot classpath
Track changes in build/make to add core-simple to the
runtime boot classpath.
Bug: 113148576
Test: Treehugger / build / boot
Test: CTS: run cts-dev -m vm-tests-tf
Change-Id: I649acd3e354948e5b1a56d0531aceb45f244aa9d
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 81c82b7..2c073fe 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -447,7 +447,8 @@
$$($(3)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \
$$($(3)TARGET_OUT_SHARED_LIBRARIES)/libopenjdkd.so \
$$(TARGET_OUT_JAVA_LIBRARIES)/core-libart-testdex.jar \
- $$(TARGET_OUT_JAVA_LIBRARIES)/core-oj-testdex.jar
+ $$(TARGET_OUT_JAVA_LIBRARIES)/core-oj-testdex.jar \
+ $$(TARGET_OUT_JAVA_LIBRARIES)/core-simple-testdex.jar
$$(gtest_rule): PRIVATE_TARGET_EXE := $$(gtest_target_exe)
$$(gtest_rule): PRIVATE_MAYBE_CHROOT_COMMAND := $$(maybe_chroot_command)