Merge "Set JAVAC_WRAPPER if USE_GOMA is set."
diff --git a/core/config.mk b/core/config.mk
index 5895128..328340e 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -800,6 +800,13 @@
SUPPORT_LIBRARY_ROOT := frameworks/support
endif
+#################################################################
+# Set up minimal BOOTCLASSPATH list of jars to build/execute
+# java code with dalvikvm/art.
+#################################################################
+TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml
+HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))
+
# Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N.
# The 'current' version is whatever this source tree is.
#
diff --git a/target/product/base.mk b/target/product/base.mk
index a671203..89027bf 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -23,6 +23,7 @@
appops \
am \
android.policy \
+ android.test.mock \
android.test.runner \
app_process \
applypatch \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 2fb450d..cea6bce 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -85,18 +85,13 @@
# The order matters
PRODUCT_BOOT_JARS := \
- core-oj \
- core-libart \
- conscrypt \
- okhttp \
+ $(TARGET_CORE_JARS) \
legacy-test \
- bouncycastle \
ext \
framework \
telephony-common \
voip-common \
ims-common \
- apache-xml \
nullwebview \
org.apache.http.legacy.boot