From 52a23cfbb3f01135825bb89051902c1b1b9ae6bb Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 3 Jul 2018 12:02:12 +0100 Subject: [PATCH] Move packages from base_system to base_vendor. These install on the vendor partition. Clean up the whitelist. Bug: 80410283 Test: lunch mainline_arm64; m nothing Change-Id: I45df64e1fa060ea98534351140678589afe2e340 Merged-In: I45df64e1fa060ea98534351140678589afe2e340 --- target/product/base_system.mk | 1 - target/product/base_vendor.mk | 1 + target/product/mainline_system.mk | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index a94eecaa5..79a237805 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -115,7 +115,6 @@ PRODUCT_PACKAGES += \ libc_malloc_hooks \ libcutils \ libdl \ - libdrmclearkeyplugin \ libdrmframework \ libdrmframework_jni \ libEGL \ diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 678b60af2..6a0311bb6 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -35,6 +35,7 @@ PRODUCT_PACKAGES += \ libbundlewrapper \ libclearkeycasplugin \ libdownmix \ + libdrmclearkeyplugin \ libeffectproxy \ libeffects \ libldnhncr \ diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index 651ece640..96c0dcbf8 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -37,8 +37,6 @@ _selinux_policy_whitelist := \ _base_mk_whitelist := \ $(_selinux_policy_whitelist) \ recovery/root/etc/mke2fs.conf \ - vendor/lib/mediadrm/libdrmclearkeyplugin.so \ - vendor/lib64/mediadrm/libdrmclearkeyplugin.so \ _my_whitelist := $(_base_mk_whitelist)