From c4e790dc6474566799012728f9e67f5d794975b4 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Sat, 30 Jun 2012 16:13:26 -0700
Subject: [PATCH] Create telephony-common and mms-common - DO NOT MERGE

These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
---
 core/dex_preopt.mk     | 2 +-
 target/product/core.mk | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 38982c099..4c51b10b6 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -4,7 +4,7 @@
 ####################################
 
 # TODO: replace it with device's BOOTCLASSPATH
-DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:android.policy:services:apache-xml
+DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:telephony-common:mms-common:android.policy:services:apache-xml
 DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
 
 DEXPREOPT_BUILD_DIR := $(OUT_DIR)
diff --git a/target/product/core.mk b/target/product/core.mk
index 688c80684..8cf3b3e76 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -119,7 +119,9 @@ PRODUCT_PACKAGES := \
     screencap \
     sensorservice \
     lint \
-    uiautomator
+    uiautomator \
+    telephony-common \
+    mms-common \
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:root/init.usb.rc \
-- 
2.11.0