am 3deea32a: Merge "Enable DRM support in the SDK system image"

* commit '3deea32a31e16d92d1d632b5a1bd260416f6e7d5': Enable DRM support in the SDK system image
2012-05-24 14:27:51 -07:00
parent 27a4fa10a9 3deea32a31
commit 9f312b8156
2 changed files with 4 additions and 4 deletions
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -97,7 +97,10 @@ PRODUCT_PACKAGES := \
    libwilhelm \
    libz \
    screencap \
-    sensorservice
+    sensorservice \
+    drmserver \
+    libdrmframework \
+    libdrmframework_jni

 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -20,9 +20,6 @@
 # in inherited configurations.

 PRODUCT_PACKAGES := \
-    drmserver \
-    libdrmframework \
-    libdrmframework_jni \
    libfwdlockengine \
    OpenWnn \
    PinyinIME \