From ce5eb452bed901718e61fae5a47a56666a72c631 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 2 Jul 2018 14:36:28 +0100
Subject: [PATCH] Include partition-split selinux_policy modules.

The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.

Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
Merged-In: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
---
 target/product/base_system.mk     |  2 +-
 target/product/base_vendor.mk     |  1 +
 target/product/mainline_system.mk | 14 --------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index a94eecaa55..8eef95e763 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -218,7 +218,7 @@ PRODUCT_PACKAGES += \
     screencap \
     sdcard \
     secdiscard \
-    selinux_policy \
+    selinux_policy_system \
     sensorservice \
     service \
     servicemanager \
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 678b60af2e..b6b2450e98 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES += \
     libril \
     libvisualizer \
     passwd \
+    selinux_policy_nonsystem \
     shell_and_utilities_vendor \
     vndservice \
     vndservicemanager \
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 96365b5031..80e8f53608 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -21,21 +21,7 @@ PRODUCT_NAME := mainline_system
 PRODUCT_BRAND := generic
 PRODUCT_SHIPPING_API_LEVEL := 28
 
-_selinux_policy_whitelist := \
-  vendor/etc/selinux/vndservice_contexts \
-  vendor/etc/selinux/plat_pub_versioned.cil \
-  vendor/etc/selinux/plat_sepolicy_vers.txt \
-  vendor/etc/selinux/precompiled_sepolicy \
-  vendor/etc/selinux/precompiled_sepolicy.plat_and_mapping.sha256 \
-  vendor/etc/selinux/vendor_file_contexts \
-  vendor/etc/selinux/vendor_hwservice_contexts \
-  vendor/etc/selinux/vendor_mac_permissions.xml \
-  vendor/etc/selinux/vendor_property_contexts \
-  vendor/etc/selinux/vendor_seapp_contexts \
-  vendor/etc/selinux/vendor_sepolicy.cil \
-
 _base_mk_whitelist := \
-  $(_selinux_policy_whitelist) \
   recovery/root/etc/mke2fs.conf \
   root/init \
   root/init.environ.rc \