commit 86a048d4dfa9271b87c413c00412a7cd4efaa2b0
author Bowgo Tsai <bowgotsai@google.com> Mon Sep 09 22:04:06 2019 +0800
committer Bowgo Tsai <bowgotsai@google.com> Thu Sep 26 21:28:07 2019 +0800
tree 61b94c60552cf3a674dedf9a66808f5210c045cc
parent 948934bae36a563825e33e54386a987e7a3a0658

Separate system_ext_file_contexts out of system sepolicy.

Bug: 137712473
Test: boot crosshatch
Change-Id: I09f63771d08ad18fb41fca801dd587b086be58c7

Android.mk

diff --git a/Android.mk b/Android.mk
index 6ab494b..d4f09c4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -314,6 +314,8 @@
 ifdef HAS_SYSTEM_EXT_SEPOLICY
 LOCAL_REQUIRED_MODULES += \
     system_ext_sepolicy.cil \
+    system_ext_file_contexts \
+    system_ext_file_contexts_test \
     system_ext_mapping_file \
 
 endif
@@ -1313,6 +1315,10 @@
 
 local_fc_files := $(call build_policy, file_contexts, $(PLAT_PRIVATE_POLICY))
 
+ifdef HAS_SYSTEM_EXT_SEPOLICY
+local_fc_files += $(call build_policy, file_contexts, $(SYSTEM_EXT_PRIVATE_POLICY))
+endif
+
 ifdef HAS_PRODUCT_SEPOLICY
 local_fc_files += $(call build_policy, file_contexts, $(PRODUCT_PRIVATE_POLICY))
 endif
@@ -1447,6 +1453,9 @@
 
 all_fc_files := $(TARGET_OUT)/etc/selinux/plat_file_contexts
 all_fc_files += $(TARGET_OUT_VENDOR)/etc/selinux/vendor_file_contexts
+ifdef HAS_SYSTEM_EXT_SEPOLICY
+all_fc_files += $(TARGET_OUT_SYSTEM_EXT)/etc/selinux/system_ext_file_contexts
+endif
 ifdef HAS_PRODUCT_SEPOLICY
 all_fc_files += $(TARGET_OUT_PRODUCT)/etc/selinux/product_file_contexts
 endif