commit ee0748821f9d091dad21ad6baa08f3f3a2878b73
author Stuart Scott <stuartscott@google.com> Mon Aug 05 15:21:00 2013 -0700
committer Stuart Scott <stuartscott@google.com> Mon Aug 05 16:05:08 2013 -0700
tree 48bbce447ebb59cf6dbd485ef1169a53dd2fbe71
parent bc9e8a7c7f1529a2295122d42edff69c8acf1bdf

Add boot jars to fix Dalvik missing bootclasspath for mini emulator.

bug: 10146858

Change-Id: I159a5951a036f32c7eb02569c5b0fb12ce3a76dd

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index dcba51f..0776892 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -31,6 +31,3 @@
     VpnDialogs
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)
-
-# Override the PRODUCT_BOOT_JARS set in core_minimal.mk
-PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium

target/product/core_base.mk

diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index ecc59c7..cde2b85 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -67,3 +67,5 @@
     voip-common
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
+# Override the PRODUCT_BOOT_JARS set in core_minimal.mk
+PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium