commit 1864cd02fc345d92d28a245b9b082e580dd907bf
author Bowgo Tsai <bowgotsai@google.com> Mon Sep 09 18:09:22 2019 +0800
committer Bowgo Tsai <bowgotsai@google.com> Thu Sep 26 21:29:22 2019 +0800
tree 297b89c760fdd3c7c9a6f2b633f423507d16a6ec
parent 241d36eedd8f1e2086fdd58e0ffafbc20121c0ce

Separate system_ext_property_contexts out of system sepolicy.

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 170e7ca..e8bb270 100644
--- a/Android.bp
+++ b/Android.bp
@@ -256,6 +256,13 @@
 }
 
 property_contexts {
+    name: "system_ext_property_contexts",
+    srcs: [":property_contexts_files"],
+    system_ext_specific: true,
+    recovery_available: true,
+}
+
+property_contexts {
     name: "product_property_contexts",
     srcs: [":property_contexts_files"],
     product_specific: true,

Android.mk

diff --git a/Android.mk b/Android.mk
index 5cb79be..e570247 100644
--- a/Android.mk
+++ b/Android.mk
@@ -318,6 +318,8 @@
     system_ext_file_contexts_test \
     system_ext_hwservice_contexts \
     system_ext_hwservice_contexts_test \
+    system_ext_property_contexts \
+    system_ext_property_contexts_test \
     system_ext_seapp_contexts \
     system_ext_mapping_file \
 

contexts_tests.mk

diff --git a/contexts_tests.mk b/contexts_tests.mk
index 0073e9c..0b7e856 100644
--- a/contexts_tests.mk
+++ b/contexts_tests.mk
@@ -163,6 +163,24 @@
 
 ##################################
 
+ifdef HAS_SYSTEM_EXT_SEPOLICY
+
+pc_files += $(system_ext_out)/system_ext_property_contexts
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := system_ext_property_contexts_test
+LOCAL_MODULE_CLASS := FAKE
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(eval $(call run_contexts_test, $(pc_files), $(property_info_checker),))
+
+endif
+
+##################################
+
 pc_files += $(vendor_out)/vendor_property_contexts
 
 include $(CLEAR_VARS)

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 6fa1c56..3d967a7 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -424,6 +424,7 @@
 
 /(system_ext|system/system_ext)/etc/selinux/system_ext_file_contexts      u:object_r:file_contexts_file:s0
 /(system_ext|system/system_ext)/etc/selinux/system_ext_hwservice_contexts u:object_r:hwservice_contexts_file:s0
+/(system_ext|system/system_ext)/etc/selinux/system_ext_property_contexts  u:object_r:property_contexts_file:s0
 /(system_ext|system/system_ext)/etc/selinux/system_ext_seapp_contexts     u:object_r:seapp_contexts_file:s0
 
 #############################