From ba14d0e33751c10e6e53df0d686bbb12181c6586 Mon Sep 17 00:00:00 2001 From: Adam Hampson Date: Thu, 15 May 2014 16:28:39 -0700 Subject: [PATCH] move telephony, mms, and voip common jars to core_minimal These jars need to be present on Molly to pass CTS. Bug: 13075332 Change-Id: I175871c2e7cff107e3f30ba4541171ebc13509d2 Signed-off-by: Adam Hampson --- target/product/core_base.mk | 21 --------------------- target/product/core_minimal.mk | 6 ++++++ 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/target/product/core_base.mk b/target/product/core_base.mk index 4c3dc56f5..0f793bbde 100644 --- a/target/product/core_base.mk +++ b/target/product/core_base.mk @@ -57,28 +57,7 @@ PRODUCT_PACKAGES += \ libvariablespeed \ libwebrtc_audio_preprocessing \ mdnsd \ - mms-common \ requestsync \ - telephony-common \ - voip-common \ wifi-service $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk) -# Override the PRODUCT_BOOT_JARS set in core_minimal.mk. The order matters. -PRODUCT_BOOT_JARS := \ - core \ - conscrypt \ - okhttp \ - core-junit \ - bouncycastle \ - ext \ - framework \ - framework2 \ - telephony-common \ - voip-common \ - mms-common \ - android.policy \ - services \ - apache-xml \ - webviewchromium \ - wifi-service diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 8d9ba15c1..3ecad4cb0 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -57,10 +57,13 @@ PRODUCT_PACKAGES += \ libwilhelm \ logd \ make_ext4fs \ + mms-common \ screencap \ sensorservice \ + telephony-common \ uiautomator \ uncrypt \ + voip-common \ webview \ wifi-service @@ -74,6 +77,9 @@ PRODUCT_BOOT_JARS := \ ext \ framework \ framework2 \ + telephony-common \ + voip-common \ + mms-common \ android.policy \ services \ apache-xml \ -- 2.11.0