commit 1a56e38edc2f2f6189ef405ee1edce554e15cbc0
author Shikha Panwar <shikhapanwar@google.com> Wed Mar 26 13:01:01 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 26 13:01:01 2025 -0700
tree ac602be6f6883c0e0fabb16dc9bde63ea4d4c8c5
parent 3c927eeee26d49f244ec43116b0955cc76d52785
parent 5c22e20c8d161113c940dd882de5c1f3b325164b

Merge "Use non nostd secretkeeper_* libraries" into main

security/secretkeeper/aidl/vts/Android.bp

diff --git a/security/secretkeeper/aidl/vts/Android.bp b/security/secretkeeper/aidl/vts/Android.bp
index 4353ca5..8c7f624 100644
--- a/security/secretkeeper/aidl/vts/Android.bp
+++ b/security/secretkeeper/aidl/vts/Android.bp
@@ -58,8 +58,8 @@
         "libexplicitkeydice",
         "liblog_rust",
         "libsecretkeeper_client",
-        "libsecretkeeper_comm_nostd",
-        "libsecretkeeper_core_nostd",
+        "libsecretkeeper_comm",
+        "libsecretkeeper_core",
         "libsecretkeeper_test",
     ],
     require_root: true,
@@ -83,7 +83,7 @@
         "libhex",
         "liblog_rust",
         "libsecretkeeper_client",
-        "libsecretkeeper_comm_nostd",
+        "libsecretkeeper_comm",
         "libsecretkeeper_test",
     ],
 }

security/secretkeeper/default/Android.bp

diff --git a/security/secretkeeper/default/Android.bp b/security/secretkeeper/default/Android.bp
index 134afc9..a88c90c 100644
--- a/security/secretkeeper/default/Android.bp
+++ b/security/secretkeeper/default/Android.bp
@@ -37,8 +37,8 @@
         "libbinder_rs",
         "libcoset",
         "liblog_rust",
-        "libsecretkeeper_core_nostd",
-        "libsecretkeeper_comm_nostd",
+        "libsecretkeeper_core",
+        "libsecretkeeper_comm",
     ],
 }