diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-24 10:14:05 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-24 10:14:05 -0700 |
| commit | 3deea32a31e16d92d1d632b5a1bd260416f6e7d5 (patch) | |
| tree | 71402212230dc1ad2b7020427b1d54149bf2f537 | |
| parent | 2d0055dd3d3f067ef0ab2db6f8358b69d60880d9 (diff) | |
| parent | 020e159f2d57c259885bd2bbac84cd47f289e7ee (diff) | |
| download | build-3deea32a31e16d92d1d632b5a1bd260416f6e7d5.tar.gz | |
Merge "Enable DRM support in the SDK system image"
| -rw-r--r-- | target/product/core.mk | 5 | ||||
| -rw-r--r-- | 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 \ |