commit 3542c0848f6468a5577f9488f90ebb73aabcaa34
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Feb 15 07:25:20 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 15 07:25:20 2025 -0800
tree 5de9951ee71cb47c5f90f3bdd15807d4c3837454
parent adc9a64d1ebc47d27b58a55ea2d306d1908508cd
parent cf1376b288657dc4496bcfd90910cbd7997dfc79

Merge "trusty: keymint: provision boot_info to Keymint Rust in TEE" into main

trusty/keymint/Android.bp

diff --git a/trusty/keymint/Android.bp b/trusty/keymint/Android.bp
index d1cd71b..80e58f9 100644
--- a/trusty/keymint/Android.bp
+++ b/trusty/keymint/Android.bp
@@ -57,6 +57,13 @@
     vendor: true,
     defaults: ["android.hardware.security.keymint-service.rust.trusty.default"],
     init_rc: ["android.hardware.security.keymint-service.trusty_tee.rc"],
+    features: select(soong_config_variable("trusty_system_vm", "placeholder_trusted_hal"), {
+        true: ["nonsecure"],
+        default: [],
+    }),
+    rustlibs: [
+        "libkmr_hal_nonsecure",
+    ],
 }
 
 // Keymint hal service in system_ext, interacting with the Trusty Security VM.