commit a14a285f2d74b8a75b77f30a0f458dca551413e2
author Abhisek Devkota <ciwrl@cyanogenmod.com> Wed Jun 11 19:26:41 2014 +0000
committer Gerrit Code Review <gerrit@cyanogenmod.org> Wed Jun 11 19:26:41 2014 +0000
tree 3ce8916b1a68812920c15573f08b9d63ee38fe14
parent 7d5d16dd75df6c883e01d713c35f69a6eebcb313
parent ee17a7d7ce2fd4189071dda5180a2feeb138d92c

Merge "Added apn settings for Mobitel and Etisalat, Sri Lanka (MCC=413)" into cm-11.0

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index bd0cc81..b64bd1f 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -189,6 +189,13 @@
 PRODUCT_PACKAGES += \
     rsync
 
+# Stagefright FFMPEG plugin
+PRODUCT_PACKAGES += \
+    libstagefright_soft_ffmpegadec \
+    libstagefright_soft_ffmpegvdec \
+    libFFmpegExtractor \
+    libnamparser
+
 # These packages are excluded from user builds
 ifneq ($(TARGET_BUILD_VARIANT),user)
 

config/common_full.mk

diff --git a/config/common_full.mk b/config/common_full.mk
index ffdb2da..9f51f80 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -31,13 +31,6 @@
     libvideoeditor_videofilters \
     libvideoeditorplayer
 
-# Stagefright FFMPEG plugin
-PRODUCT_PACKAGES += \
-    libstagefright_soft_ffmpegadec \
-    libstagefright_soft_ffmpegvdec \
-    libFFmpegExtractor \
-    libnamparser
-
 # Extra tools in CM
 PRODUCT_PACKAGES += \
     vim