commit b02bda26bd6d7c9117214bc0e5672245a99cb1c4
author Anton Hansson <hansson@google.com> Tue Jul 10 06:27:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 10 06:27:30 2018 +0000
tree 1a93fb8eaa896a9c92dfc422f3e44a2c08f789fa
parent 56a34987030ee776a2762ceccad0030162fdc396
parent 52a23cfbb3f01135825bb89051902c1b1b9ae6bb

Merge "Move packages from base_system to base_vendor."

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5806309..c683f7b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -112,7 +112,6 @@
     libc_malloc_hooks \
     libcutils \
     libdl \
-    libdrmclearkeyplugin \
     libdrmframework \
     libdrmframework_jni \
     libEGL \

target/product/base_vendor.mk

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index b6b2450..681def2 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -35,6 +35,7 @@
     libbundlewrapper \
     libclearkeycasplugin \
     libdownmix \
+    libdrmclearkeyplugin \
     libeffectproxy \
     libeffects \
     libldnhncr \

target/product/mainline_system.mk

diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 2e161db..c45f911 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -23,8 +23,6 @@
 
 _base_mk_whitelist := \
   recovery/root/etc/mke2fs.conf \
-  vendor/lib/mediadrm/libdrmclearkeyplugin.so \
-  vendor/lib64/mediadrm/libdrmclearkeyplugin.so \
 
 _my_whitelist := $(_base_mk_whitelist)