From 020e159f2d57c259885bd2bbac84cd47f289e7ee Mon Sep 17 00:00:00 2001
From: Jun Tian <jun.j.tian@intel.com>
Date: Fri, 4 May 2012 10:36:03 +0800
Subject: [PATCH] Enable DRM support in the SDK system image

Move the DRM packages from full_base.mk to core.mk to support DRM both on full and SDK building.
It can fix the DRM CTS failures in the system image for emulator.

Change-Id: Id12b0ca83a815aac90860230582882e370693522
---
 target/product/core.mk      | 5 ++++-
 target/product/full_base.mk | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/product/core.mk b/target/product/core.mk
index abb2d9f438..34bad8e177 100644
--- 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)
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index d89af511aa..e220778ba8 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 \