commit 31c624f2f684a88bbcb3a8bfaa61a74d08616a42
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 11 01:13:18 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 11 01:13:18 2024 +0000
tree 5d119aad3e2c426ccb0bcd2bc4f9342b7a980f87
parent 73cd61528aedec3ab23014a9aaf14f37f286e4da
parent b949a1b6a7ab428f2ea696b42434caa59d72a661

Snap for 11828632 from b949a1b6a7ab428f2ea696b42434caa59d72a661 to 24Q3-release

Change-Id: I849b08e981aabcacc8bdb8c34cd061c12b61cbaf

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",