commit 3deea32a31e16d92d1d632b5a1bd260416f6e7d5
author Jean-Baptiste Queru <jbq@google.com> Thu May 24 10:14:05 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu May 24 10:14:05 2012 -0700
tree 71402212230dc1ad2b7020427b1d54149bf2f537
parent 2d0055dd3d3f067ef0ab2db6f8358b69d60880d9
parent 020e159f2d57c259885bd2bbac84cd47f289e7ee

Merge "Enable DRM support in the SDK system image"

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index abb2d9f..34bad8e 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -97,7 +97,10 @@
     libwilhelm \
     libz \
     screencap \
-    sensorservice
+    sensorservice \
+    drmserver \
+    libdrmframework \
+    libdrmframework_jni
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)

target/product/full_base.mk

diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index d89af51..e220778 100644
--- 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 \