From f29b5bd380e5ecced9bfa1d241e8b47448c29040 Mon Sep 17 00:00:00 2001
From: Mike Dodd <mdodd@google.com>
Date: Tue, 11 Aug 2015 13:14:09 -0700
Subject: [PATCH] Include new AOSP messaging app in base AOSP telephony builds.

b/23110861

Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
---
 target/product/aosp_base_telephony.mk | 3 +++
 target/product/telephony.mk           | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/product/aosp_base_telephony.mk b/target/product/aosp_base_telephony.mk
index f326a00159..0d4e333561 100644
--- a/target/product/aosp_base_telephony.mk
+++ b/target/product/aosp_base_telephony.mk
@@ -14,3 +14,6 @@
 # limitations under the License.
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
+PRODUCT_PACKAGES += \
+    messaging
diff --git a/target/product/telephony.mk b/target/product/telephony.mk
index 084f86c301..919d0240f2 100644
--- a/target/product/telephony.mk
+++ b/target/product/telephony.mk
@@ -21,7 +21,6 @@ PRODUCT_PACKAGES := \
     CarrierConfig \
     Dialer \
     CallLogBackup \
-    Mms \
     rild
 
 PRODUCT_COPY_FILES := \