commit cc23263ece2a5926fa97b814a404db32fc8f9181
author Jorge E. Moreira <jemoreira@google.com> Thu Apr 30 12:26:09 2020 -0700
committer Jorge E. Moreira <jemoreira@google.com> Thu Apr 30 15:14:32 2020 -0700
tree 79942e7e4b0f049ff7a8ca57e68446a18724f456
parent 038f0bfc5adcdb1c4ee363e6d65dcf6bb60eb59c

Separate system_ext sepolicy from vendor

Bug: 155141045
Test: locally
Change-Id: I8292246c6491f755703f6475a256d337cac6ab2b
Merged-In: I8292246c6491f755703f6475a256d337cac6ab2b

shared/BoardConfig.mk

diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 700f821..2e1a863 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -108,7 +108,7 @@
 PRODUCT_PRIVATE_SEPOLICY_DIRS := device/google/cuttlefish/shared/sepolicy/product/private
 # PRODUCT_PUBLIC_SEPOLICY_DIRS := device/google/cuttlefish/shared/sepolicy/product/public
 # system_ext sepolicy
-# BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/cuttlefish/shared/sepolicy/system_ext/private
+BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/cuttlefish/shared/sepolicy/system_ext/private
 # BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/cuttlefish/shared/sepolicy/system_ext/public
 
 VSOC_STLPORT_INCLUDES :=

shared/sepolicy/system_ext/private/con_monitor.te

diff --git a/shared/sepolicy/vendor/google/con_monitor.te b/shared/sepolicy/system_ext/private/con_monitor.te
similarity index 100%
rename from shared/sepolicy/vendor/google/con_monitor.te
rename to shared/sepolicy/system_ext/private/con_monitor.te

shared/sepolicy/system_ext/private/file.te

diff --git a/shared/sepolicy/vendor/google/file.te b/shared/sepolicy/system_ext/private/file.te
similarity index 100%
rename from shared/sepolicy/vendor/google/file.te
rename to shared/sepolicy/system_ext/private/file.te

shared/sepolicy/system_ext/private/file_contexts

diff --git a/shared/sepolicy/vendor/google/file_contexts b/shared/sepolicy/system_ext/private/file_contexts
similarity index 100%
rename from shared/sepolicy/vendor/google/file_contexts
rename to shared/sepolicy/system_ext/private/file_contexts

shared/sepolicy/system_ext/private/logger_app.te

diff --git a/shared/sepolicy/vendor/google/logger_app.te b/shared/sepolicy/system_ext/private/logger_app.te
similarity index 100%
rename from shared/sepolicy/vendor/google/logger_app.te
rename to shared/sepolicy/system_ext/private/logger_app.te

shared/sepolicy/system_ext/private/platform_app.te

diff --git a/shared/sepolicy/vendor/google/platform_app.te b/shared/sepolicy/system_ext/private/platform_app.te
similarity index 100%
rename from shared/sepolicy/vendor/google/platform_app.te
rename to shared/sepolicy/system_ext/private/platform_app.te

shared/sepolicy/system_ext/private/priv_app.te

diff --git a/shared/sepolicy/vendor/google/priv_app.te b/shared/sepolicy/system_ext/private/priv_app.te
similarity index 100%
rename from shared/sepolicy/vendor/google/priv_app.te
rename to shared/sepolicy/system_ext/private/priv_app.te

shared/sepolicy/system_ext/private/property.te

diff --git a/shared/sepolicy/vendor/google/property.te b/shared/sepolicy/system_ext/private/property.te
similarity index 100%
rename from shared/sepolicy/vendor/google/property.te
rename to shared/sepolicy/system_ext/private/property.te

shared/sepolicy/system_ext/private/property_contexts

diff --git a/shared/sepolicy/vendor/google/property_contexts b/shared/sepolicy/system_ext/private/property_contexts
similarity index 100%
rename from shared/sepolicy/vendor/google/property_contexts
rename to shared/sepolicy/system_ext/private/property_contexts

shared/sepolicy/system_ext/private/ramdump_app.te

diff --git a/shared/sepolicy/vendor/google/ramdump_app.te b/shared/sepolicy/system_ext/private/ramdump_app.te
similarity index 100%
rename from shared/sepolicy/vendor/google/ramdump_app.te
rename to shared/sepolicy/system_ext/private/ramdump_app.te

shared/sepolicy/system_ext/private/seapp_contexts

diff --git a/shared/sepolicy/vendor/google/seapp_contexts b/shared/sepolicy/system_ext/private/seapp_contexts
similarity index 100%
rename from shared/sepolicy/vendor/google/seapp_contexts
rename to shared/sepolicy/system_ext/private/seapp_contexts

shared/sepolicy/system_ext/private/system_app.te

diff --git a/shared/sepolicy/system_ext/private/system_app.te b/shared/sepolicy/system_ext/private/system_app.te
new file mode 100644
index 0000000..326d9fd
--- /dev/null
+++ b/shared/sepolicy/system_ext/private/system_app.te
@@ -0,0 +1 @@
+get_prop(system_app, vendor_aware_available_prop)

shared/sepolicy/vendor/google/system_app.te

diff --git a/shared/sepolicy/vendor/google/system_app.te b/shared/sepolicy/vendor/google/system_app.te
index 2cf098a..cb6287b 100644
--- a/shared/sepolicy/vendor/google/system_app.te
+++ b/shared/sepolicy/vendor/google/system_app.te
@@ -1,2 +1 @@
 allow system_app hal_wlc_hwservice:hwservice_manager find;
-get_prop(system_app, vendor_aware_available_prop)