diff --git a/device-oriole.mk b/device-oriole.mk index ee40a2e..f432187 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -22,9 +22,6 @@ include device/google/gs-common/touch/stm/stm11.mk PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.rc -# Bluetooth sepolicy -include device/google/gs101/sepolicy/oriole-sepolicy.mk - # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ diff --git a/device-raven.mk b/device-raven.mk index a227078..96cf3f8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -32,9 +32,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ UwbOverlayR4 -# Bluetooth sepolicy -include device/google/gs101/sepolicy/raven-sepolicy.mk - # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 9b09a81..1cfc4a3 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -22,7 +22,7 @@ TARGET_SCREEN_DENSITY := 420 BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk -include device/google/gs101/sepolicy/oriole-sepolicy.mk +include device/google/raviole/sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk # Kernel modules diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 1570ec7..9d46603 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -22,7 +22,7 @@ TARGET_SCREEN_DENSITY := 560 BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk -include device/google/gs101/sepolicy/raven-sepolicy.mk +include device/google/raviole/sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk # Kernel modules diff --git a/sepolicy/oriole-sepolicy.mk b/sepolicy/oriole-sepolicy.mk new file mode 100644 index 0000000..ae26e1a --- /dev/null +++ b/sepolicy/oriole-sepolicy.mk @@ -0,0 +1,5 @@ +# Oriole only sepolicy +BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/oriole + +BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common +BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l25 diff --git a/sepolicy/oriole/euiccpixel_app.te b/sepolicy/oriole/euiccpixel_app.te new file mode 100644 index 0000000..5472658 --- /dev/null +++ b/sepolicy/oriole/euiccpixel_app.te @@ -0,0 +1,6 @@ +# EuiccSupportPixel app + +userdebug_or_eng(` + allow euiccpixel_app sysfs_touch:dir search; +') + diff --git a/sepolicy/oriole/grilservice_app.te b/sepolicy/oriole/grilservice_app.te new file mode 100644 index 0000000..ad0a779 --- /dev/null +++ b/sepolicy/oriole/grilservice_app.te @@ -0,0 +1 @@ +allow grilservice_app hal_bluetooth_coexistence_service:service_manager find; diff --git a/sepolicy/raven-sepolicy.mk b/sepolicy/raven-sepolicy.mk new file mode 100644 index 0000000..d7a9251 --- /dev/null +++ b/sepolicy/raven-sepolicy.mk @@ -0,0 +1,5 @@ +# Ravne only sepolicy +BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/raven + +BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common +BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l25 diff --git a/sepolicy/raven/cccdk_timesync_app.te b/sepolicy/raven/cccdk_timesync_app.te new file mode 100644 index 0000000..1a4264d --- /dev/null +++ b/sepolicy/raven/cccdk_timesync_app.te @@ -0,0 +1 @@ +allow vendor_cccdktimesync_app hal_bluetooth_coexistence_service:service_manager find; diff --git a/sepolicy/raven/euiccpixel_app.te b/sepolicy/raven/euiccpixel_app.te new file mode 100644 index 0000000..5472658 --- /dev/null +++ b/sepolicy/raven/euiccpixel_app.te @@ -0,0 +1,6 @@ +# EuiccSupportPixel app + +userdebug_or_eng(` + allow euiccpixel_app sysfs_touch:dir search; +') + diff --git a/sepolicy/raven/grilservice_app.te b/sepolicy/raven/grilservice_app.te new file mode 100644 index 0000000..ad0a779 --- /dev/null +++ b/sepolicy/raven/grilservice_app.te @@ -0,0 +1 @@ +allow grilservice_app hal_bluetooth_coexistence_service:service_manager find;