summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-09-01 00:26:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 00:26:45 +0000
commit438b75544324743751af5ffa16549d4d05ddd3b6 (patch)
treee07008a6f1eeaf9a71d4a0cf01fe64ec88c75341
parent0e81a88eaca65492b71083a3301e48e159249c28 (diff)
parentee36e628741a9a0c00903dbbb6590fd1e7844911 (diff)
downloadflounder-438b75544324743751af5ffa16549d4d05ddd3b6.tar.gz
am ee36e628: Add CarrierConfig to device mk as it is needed by TeleService.
* commit 'ee36e628741a9a0c00903dbbb6590fd1e7844911': Add CarrierConfig to device mk as it is needed by TeleService.
-rw-r--r--aosp_flounder.mk1
-rw-r--r--device-lte.mk3
2 files changed, 4 insertions, 0 deletions
diff --git a/aosp_flounder.mk b/aosp_flounder.mk
index eabd747..39fd42e 100644
--- a/aosp_flounder.mk
+++ b/aosp_flounder.mk
@@ -24,6 +24,7 @@
# Live Wallpapers
PRODUCT_PACKAGES += \
rild \
+ CarrierConfig \
Launcher3
PRODUCT_PROPERTY_OVERRIDES := \
diff --git a/device-lte.mk b/device-lte.mk
index 1a151ab..50fcb13 100644
--- a/device-lte.mk
+++ b/device-lte.mk
@@ -18,6 +18,9 @@
#
# Everything in this directory will become public
+PRODUCT_PACKAGES += \
+ CarrierConfig
+
PRODUCT_PROPERTY_OVERRIDES += \
ro.telephony.default_cdma_sub=0