suspend_blocker: convert to apex

* Start the service later at 'class hal' to avoid making this into bootstrap
  APEX. 'class early_hal' is started on trigger 'on late-fs' which is too
  early for vendor APEX.
This commit is contained in:
Konsta
2025-03-19 12:59:47 +02:00
parent 080a9d7c3a
commit 4ffea81903
6 changed files with 32 additions and 7 deletions

View File

@@ -249,7 +249,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
# Suspend # Suspend
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
suspend_blocker_rpi com.android.hardware.suspend_blocker.rpi4
# Thermal # Thermal
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View File

@@ -38,8 +38,5 @@
/dev/block/mmcblk0p3 u:object_r:system_block_device:s0 /dev/block/mmcblk0p3 u:object_r:system_block_device:s0
/dev/block/mmcblk0p4 u:object_r:userdata_block_device:s0 /dev/block/mmcblk0p4 u:object_r:userdata_block_device:s0
# Suspend
/vendor/bin/suspend_blocker_rpi u:object_r:suspend_blocker_exec:s0
# V4L2 # V4L2
/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-v4l2(.*)? u:object_r:mediacodec_exec:s0 /vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-v4l2(.*)? u:object_r:mediacodec_exec:s0

View File

@@ -5,8 +5,29 @@
cc_binary { cc_binary {
name: "suspend_blocker_rpi", name: "suspend_blocker_rpi",
init_rc: ["suspend_blocker_rpi.rc"],
vendor: true, vendor: true,
srcs: ["suspend_blocker_rpi.cpp"], srcs: ["suspend_blocker_rpi.cpp"],
shared_libs: ["libpower"], shared_libs: ["libpower"],
installable: false,
}
prebuilt_etc {
name: "suspend_blocker_rpi.rc",
src: "suspend_blocker_rpi.rc",
installable: false,
}
apex {
name: "com.android.hardware.suspend_blocker.rpi4",
manifest: "apex_manifest.json",
file_contexts: "apex_file_contexts",
key: "com.android.hardware.key",
certificate: ":com.android.hardware.certificate",
updatable: false,
vendor: true,
binaries: ["suspend_blocker_rpi"],
prebuilts: [
"suspend_blocker_rpi.rc",
],
} }

View File

@@ -0,0 +1,3 @@
(/.*)? u:object_r:vendor_file:s0
/etc(/.*)? u:object_r:vendor_configs_file:s0
/bin/suspend_blocker_rpi u:object_r:suspend_blocker_exec:s0

View File

@@ -0,0 +1,4 @@
{
"name": "com.android.hardware.suspend_blocker.rpi4",
"version": 1
}

View File

@@ -1,4 +1,4 @@
service suspend_blocker_rpi /vendor/bin/suspend_blocker_rpi service suspend_blocker_rpi /apex/com.android.hardware.suspend_blocker.rpi4/bin/suspend_blocker_rpi
class early_hal # Start together with system_suspend HAL class hal
group system group system
user root user root