commit b949a1b6a7ab428f2ea696b42434caa59d72a661
author Martin Geisler <mgeisler@google.com> Fri May 10 17:17:20 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 10 17:17:20 2024 +0000
tree 5d119aad3e2c426ccb0bcd2bc4f9342b7a980f87
parent 00c2d402a7380a3eabe73dde6716fb66c246b45e
parent cabca9807769ad409dcb3cdfccd11c5497b72474

Build with mls_build_async am: 11b3e45ea7 am: cabca98077

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

Change-Id: I2aba2d396f3a6df0c1a8fb12d6ddccf622facea4
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 baeaa5a..5392c60 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,7 +30,6 @@
         "by_ref_proposal",
         "custom_proposal",
         "fast_serialize",
-        "hex",
         "out_of_order",
         "prior_epoch",
         "private_message",
@@ -40,9 +39,14 @@
         "std",
         "tree_index",
     ],
+    cfgs: [
+        "mls_build_async",
+        "mls_build_async",
+    ],
     rustlibs: [
         "libcfg_if",
         "libdebug_tree",
+        "libfutures",
         "libhex",
         "libitertools",
         "libmls_rs_codec",
@@ -52,7 +56,10 @@
         "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 99a56a9..90952f3 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -1,5 +1,5 @@
 {
-    "run_cargo": false,
+    "extra_cfg": ["mls_build_async"],
     "features": [
         "std",
         "rayon",