| commit | 8456d54f483ae2ed6fc990ce83a5aef585e49ba7 | [log] [tgz] |
|---|---|---|
| author | Armelle Laine <armellel@google.com> | Tue Sep 10 04:20:36 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 10 04:20:36 2024 +0000 |
| tree | d0ba0ce4d5b38de5cd26308299efb8af0dae9922 | |
| parent | 0fa81818f237c3338ec87eaed9f2319fb0e79bdd [diff] | |
| parent | f2d6acf081eaf71e45a57f1eb5d9f62b8ce89768 [diff] |
Merge "trusty: keymint/gatekeeper: Pass device name from init scripts" into main am: 9ec007acf4 am: f2d6acf081 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2779372 Change-Id: I944005219dc9b549eb83747352086a2a9838b9d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/trusty/gatekeeper/android.hardware.gatekeeper-service.trusty.rc b/trusty/gatekeeper/android.hardware.gatekeeper-service.trusty.rc index 66ecbd1..2c9bd83 100644 --- a/trusty/gatekeeper/android.hardware.gatekeeper-service.trusty.rc +++ b/trusty/gatekeeper/android.hardware.gatekeeper-service.trusty.rc
@@ -1,4 +1,5 @@ -service vendor.gatekeeper_default /vendor/bin/hw/android.hardware.gatekeeper-service.trusty +service vendor.gatekeeper_default /vendor/bin/hw/android.hardware.gatekeeper-service.trusty \ + --dev ${ro.hardware.trusty_ipc_dev.gatekeeper:-/dev/trusty-ipc-dev0} class hal user system group system
diff --git a/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.rc b/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.rc index 389af41..0ceb584 100644 --- a/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.rc +++ b/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.rc
@@ -1,4 +1,5 @@ -service vendor.keymint-trusty /vendor/bin/hw/android.hardware.security.keymint-service.trusty +service vendor.keymint-trusty /vendor/bin/hw/android.hardware.security.keymint-service.trusty \ + --dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0} class early_hal user nobody group drmrpc
diff --git a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.rc b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.rc index e3d94c6..3e3f2a5 100644 --- a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.rc +++ b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.rc
@@ -1,7 +1,8 @@ -service vendor.keymint.rust-trusty /vendor/bin/hw/android.hardware.security.keymint-service.rust.trusty +service vendor.keymint.rust-trusty /vendor/bin/hw/android.hardware.security.keymint-service.rust.trusty \ + --dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0} class early_hal user nobody group drmrpc # The keymint service is not allowed to restart. # If it crashes, a device restart is required. - oneshot \ No newline at end of file + oneshot