From ddc6a8dbdf6b3a9d760a435012d1b889910c3ed8 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Tue, 26 Mar 2024 15:40:37 -0700 Subject: [PATCH] Fix `.rc` file for keymint-service.nonsecure This target was using the same `.rc` as the keymint-service target, though it had a different name. Bug: 331474817 Test: LOCAL_KEYMINT_PRODUCT_PACKAGE=android.hardware.security.keymint-service.nonsecure m && launch_cvd --noresume --secure_hals=keymint,oemlock Change-Id: I0f744b75e451f6780d8f6c9bddbd5ea80c579a20 --- security/keymint/aidl/default/Android.bp | 2 +- .../android.hardware.security.keymint-service.nonsecure.rc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 security/keymint/aidl/default/android.hardware.security.keymint-service.nonsecure.rc diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp index 122a421bc7..c707845275 100644 --- a/security/keymint/aidl/default/Android.bp +++ b/security/keymint/aidl/default/Android.bp @@ -50,7 +50,7 @@ rust_binary { name: "android.hardware.security.keymint-service.nonsecure", relative_install_path: "hw", vendor: true, - init_rc: ["android.hardware.security.keymint-service.rc"], + init_rc: ["android.hardware.security.keymint-service.nonsecure.rc"], vintf_fragments: [ "android.hardware.security.keymint-service.xml", "android.hardware.security.sharedsecret-service.xml", diff --git a/security/keymint/aidl/default/android.hardware.security.keymint-service.nonsecure.rc b/security/keymint/aidl/default/android.hardware.security.keymint-service.nonsecure.rc new file mode 100644 index 0000000000..c792eae423 --- /dev/null +++ b/security/keymint/aidl/default/android.hardware.security.keymint-service.nonsecure.rc @@ -0,0 +1,3 @@ +service vendor.keymint-default /vendor/bin/hw/android.hardware.security.keymint-service.nonsecure + class early_hal + user nobody