commit 3855d14388ef8a197bd07b1092bece0925fad3ae
author Andrew Walbran <qwandor@google.com> Tue Nov 14 13:17:25 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 14 13:17:25 2023 +0000
tree b180af4f07f984d46057f26141c71feaf5700788
parent 941d99e05309de8a0013df9aa5cada987928d7fc
parent cbb2c115f9b88fdb117a9afdd3a46341783f9a86

Migrate to cargo_embargo. am: cbb2c115f9

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-stream/+/2828230

Change-Id: I3081d68322abdd42cc93849c5ffcc63b9c539bc7
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 d80fdf7..357bd1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index aae1f59..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices"
-  ],
-  "device": true,
-  "features": "time,net,io-util,fs",
-  "min-sdk-version": "29",
-  "run": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..2fff605
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,14 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices"
+  ],
+  "features": [
+    "time",
+    "net",
+    "io-util",
+    "fs"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false
+}