commit 2ecf280390a41df2f58a9af1401e2dbac2e7c4cc
author Pierre-Clément Tosi <ptosi@google.com> Mon Feb 13 23:06:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 13 23:06:27 2023 +0000
tree 65a4f7b4976711e9d41ca57b6d357fd4aafb55bd
parent ce7a278ec46d98fe0de7ef4199a9816081bec94a
parent a7f334a688b8061b2aa13b5d3b70d1c74cfa8739

ANDROID: Make Rust bindgens wrap their libs am: a7f334a688

Original change: https://android-review.googlesource.com/c/platform/external/open-dice/+/2430697

Change-Id: I04adf5c8481a1f7665bfdfe668035f58bf8b9c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 5f9cda2..1ec5bbe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -302,10 +302,7 @@
     wrapper_src: "rust/dice.h",
     crate_name: "open_dice_cbor_bindgen",
     source_stem: "bindings",
-    header_libs: [
-        "libopen_dice_boringssl_ed25519_headers",
-        "libopen_dice_headers",
-    ],
+    whole_static_libs: ["libopen_dice_cbor"],
 
     // Generate bindings only for the symbols that are actually exported (see exported.map.txt).
     // This makes the generated bindings much more concise and improves compilation
@@ -363,9 +360,7 @@
     wrapper_src: "rust/android/bcc.h",
     crate_name: "open_dice_bcc_bindgen",
     source_stem: "bindings",
-    header_libs: [
-        "libopen_dice_headers",
-    ],
+    whole_static_libs: ["libopen_dice_bcc"],
 
     // Generate bindings only for the symbols that are actually exported (see exported.map.txt).
     // This makes the generated bindings much more concise and improves compilation