From 1638fa1a3604a1b2dfc7fa6d857fd74b462efe15 Mon Sep 17 00:00:00 2001 From: Sebastian Pickl Date: Fri, 1 Dec 2023 11:30:35 +0000 Subject: [PATCH] Revert "gs-common: move sepolicy related to bootctrl hal aidl to..." Revert submission 25477883-gs-common_bootctrl-aidl Reason for revert: breaking builds b/314240126 Bug: 314240126 Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl Change-Id: I091dda3aa16bbc381b49674a642b2bfa93dfdfa8 --- bootctrl/bootctrl_aidl.mk | 2 -- bootctrl/sepolicy/aidl/device.te | 5 ----- bootctrl/sepolicy/aidl/file.te | 2 -- bootctrl/sepolicy/aidl/file_contexts | 1 - bootctrl/sepolicy/aidl/hal_bootctl_default.te | 8 -------- 5 files changed, 18 deletions(-) delete mode 100644 bootctrl/sepolicy/aidl/device.te delete mode 100644 bootctrl/sepolicy/aidl/file.te delete mode 100644 bootctrl/sepolicy/aidl/file_contexts delete mode 100644 bootctrl/sepolicy/aidl/hal_bootctl_default.te diff --git a/bootctrl/bootctrl_aidl.mk b/bootctrl/bootctrl_aidl.mk index 6133c0e..5ec9445 100644 --- a/bootctrl/bootctrl_aidl.mk +++ b/bootctrl/bootctrl_aidl.mk @@ -1,5 +1,3 @@ PRODUCT_PACKAGES += \ android.hardware.boot-service.default-pixel \ android.hardware.boot-service.default_recovery-pixel - -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bootctrl/sepolicy/aidl diff --git a/bootctrl/sepolicy/aidl/device.te b/bootctrl/sepolicy/aidl/device.te deleted file mode 100644 index 4fd0240..0000000 --- a/bootctrl/sepolicy/aidl/device.te +++ /dev/null @@ -1,5 +0,0 @@ -# devinfo block device -type devinfo_block_device, dev_type; - -# OTA -type sda_block_device, dev_type; diff --git a/bootctrl/sepolicy/aidl/file.te b/bootctrl/sepolicy/aidl/file.te deleted file mode 100644 index 5357fa9..0000000 --- a/bootctrl/sepolicy/aidl/file.te +++ /dev/null @@ -1,2 +0,0 @@ -# sysfs -type sysfs_ota, sysfs_type, fs_type; diff --git a/bootctrl/sepolicy/aidl/file_contexts b/bootctrl/sepolicy/aidl/file_contexts deleted file mode 100644 index 339896f..0000000 --- a/bootctrl/sepolicy/aidl/file_contexts +++ /dev/null @@ -1 +0,0 @@ -/vendor/bin/hw/android\.hardware\.boot-service\.default-pixel u:object_r:hal_bootctl_default_exec:s0 diff --git a/bootctrl/sepolicy/aidl/hal_bootctl_default.te b/bootctrl/sepolicy/aidl/hal_bootctl_default.te deleted file mode 100644 index 2ffeb27..0000000 --- a/bootctrl/sepolicy/aidl/hal_bootctl_default.te +++ /dev/null @@ -1,8 +0,0 @@ -allow hal_bootctl_default devinfo_block_device:blk_file rw_file_perms; -allow hal_bootctl_default sda_block_device:blk_file rw_file_perms; -allow hal_bootctl_default sysfs_ota:file rw_file_perms; -allow hal_bootctl_default tee_device:chr_file rw_file_perms; - -recovery_only(` - allow hal_bootctl_default rootfs:dir r_dir_perms; -')