summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 13:19:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 13:19:12 +0000
commita625e8b1a9c99a810a8f488ea9e43ea96fd3dd45 (patch)
treeb180af4f07f984d46057f26141c71feaf5700788
parentdf306a0fef5ff44921116d0e170c2f26d89b9094 (diff)
parentcbb2c115f9b88fdb117a9afdd3a46341783f9a86 (diff)
downloadtokio-stream-a625e8b1a9c99a810a8f488ea9e43ea96fd3dd45.tar.gz
Migrate to cargo_embargo. am: cbb2c115f9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-stream/+/2828230 Change-Id: Iad6df37acf83b0b298943afa52f4904a3bce5e8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json10
-rw-r--r--cargo_embargo.json14
3 files changed, 15 insertions, 11 deletions
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 {
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
-}
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
+}