commit | 038f0bfc5adcdb1c4ee363e6d65dcf6bb60eb59c | [log] [tgz] |
---|---|---|
author | Jorge E. Moreira <jemoreira@google.com> | Thu Apr 30 12:23:07 2020 -0700 |
committer | Jorge E. Moreira <jemoreira@google.com> | Thu Apr 30 15:13:52 2020 -0700 |
tree | 6e74ea554c52a8622fe77739d1ab74af99b90d3e | |
parent | a8b665dcf50e05388e4ccb0f4e9b820d176c44d8 [diff] |
Move sepolicy/private to sepolicy/product/private Bug: 155141045 Test: locally Change-Id: I99dcb7a262facbbd197f87c167662b0dd640bbf7 Merged-In: I99dcb7a262facbbd197f87c167662b0dd640bbf7
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index fc71c01..700f821 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk
@@ -101,9 +101,15 @@ WIFI_DRIVER_FW_PATH_STA := "/dev/null" WIFI_DRIVER_FW_PATH_AP := "/dev/null" -BOARD_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/vendor -BOARD_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/vendor/google -PRODUCT_PRIVATE_SEPOLICY_DIRS := device/google/cuttlefish/shared/sepolicy/private +# vendor sepolicy +BOARD_VENDOR_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/vendor +BOARD_VENDOR_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/vendor/google +# product sepolicy +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_PUBLIC_SEPOLICY_DIR := device/google/cuttlefish/shared/sepolicy/system_ext/public VSOC_STLPORT_INCLUDES := VSOC_STLPORT_LIBS :=
diff --git a/shared/sepolicy/private/file_contexts b/shared/sepolicy/product/private/file_contexts similarity index 100% rename from shared/sepolicy/private/file_contexts rename to shared/sepolicy/product/private/file_contexts
diff --git a/shared/sepolicy/private/property_contexts b/shared/sepolicy/product/private/property_contexts similarity index 100% rename from shared/sepolicy/private/property_contexts rename to shared/sepolicy/product/private/property_contexts
diff --git a/shared/sepolicy/private/suspend_blocker.te b/shared/sepolicy/product/private/suspend_blocker.te similarity index 100% rename from shared/sepolicy/private/suspend_blocker.te rename to shared/sepolicy/product/private/suspend_blocker.te
diff --git a/shared/sepolicy/private/tombstone_transmit.te b/shared/sepolicy/product/private/tombstone_transmit.te similarity index 100% rename from shared/sepolicy/private/tombstone_transmit.te rename to shared/sepolicy/product/private/tombstone_transmit.te