commit 3a4bb216975b46329ef7b11a160116cbcd0707e1
author Martin Geisler <mgeisler@google.com> Fri May 10 17:00:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 10 17:00:33 2024 +0000
tree 6ac5c4e7cb75303b88a17fa87fde0b2ce468b297
parent aed8706f40c9be48a5ced00135903b2fc66807f2
parent 7660bf099f204f9b34ad23b5d3d3928acf4006ab

Build with mls_build_async am: 7660bf099f

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mls-rs-core/+/3069764

Change-Id: Iacca4ddfc6f3a5d6a66595bdea01a3cf14a75246
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 070c877..2e98795 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,13 +36,20 @@
         "std",
         "x509",
     ],
+    cfgs: [
+        "mls_build_async",
+        "mls_build_async",
+    ],
     rustlibs: [
         "libhex",
         "libmls_rs_codec",
         "libthiserror",
         "libzeroize",
     ],
-    proc_macros: ["libmaybe_async"],
+    proc_macros: [
+        "libasync_trait",
+        "libmaybe_async",
+    ],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
index cb908d7..2a253ec 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -1,3 +1,3 @@
 {
-  "run_cargo": false
+    "extra_cfg": ["mls_build_async"]
 }