summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMike Dodd <mdodd@google.com>2015-08-13 15:22:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-13 15:22:44 +0000
commit17b069107654c04f0ec2cc44d54da3a44006c710 (patch)
treec00b40396cf6c4812bcd15e0480b7b838310a8ec /target
parent897f3ba8b1cc402fca16720be345ba9c587c326b (diff)
parent5bf35d0685ba62ded55cc63f3dd2f23b82cc645d (diff)
downloadbuild-17b069107654c04f0ec2cc44d54da3a44006c710.zip
build-17b069107654c04f0ec2cc44d54da3a44006c710.tar.gz
build-17b069107654c04f0ec2cc44d54da3a44006c710.tar.bz2
am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d': Include new AOSP messaging app in base AOSP telephony builds.
Diffstat (limited to 'target')
-rw-r--r--target/product/aosp_base_telephony.mk3
-rw-r--r--target/product/telephony.mk1
2 files changed, 3 insertions, 1 deletions
diff --git a/target/product/aosp_base_telephony.mk b/target/product/aosp_base_telephony.mk
index f326a00..0d4e333 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 084f86c..919d024 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 := \