commit ee36e628741a9a0c00903dbbb6590fd1e7844911
author Junda Liu <junda@google.com> Mon Aug 31 13:01:16 2015 -0700
committer Junda Liu <junda@google.com> Mon Aug 31 13:18:09 2015 -0700
tree e07008a6f1eeaf9a71d4a0cf01fe64ec88c75341
parent f5dc2deb1769b99e62c559cf71032a3ff8ca59e7

Add CarrierConfig to device mk as it is needed by TeleService.

Bug: b/23682501
Change-Id: I06ede83e7b458819b91fe534e9d21c419ccddff0

aosp_flounder.mk

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 := \

device-lte.mk

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