aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-23 00:57:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-23 00:57:34 +0000
commit4bd4beba524fd9b127d69b38d17f081f60b61bee (patch)
treef70cb742285d5820ba100639648c9c2505e4910e
parent463d17a34c752f07a920731d1b89ec1a6691a1d6 (diff)
parent49dca387bd755a7d035227a8c35ca79c680b871d (diff)
downloadmio-4bd4beba524fd9b127d69b38d17f081f60b61bee.tar.gz
Migrate to cargo_embargo. am: a4e9ae9e34 am: b50b6a3a14 am: 49dca387bd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mio/+/2838080 Change-Id: I7b1b7d8132437836d3273969103828821b807c5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json10
3 files changed, 11 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 9e9f09a..17434a8 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 f57bdc2..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "features": "net,os-ext,os-poll",
- "min-sdk-version": "29",
- "run": true,
- "vendor-available": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..203f7fc
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+ "features": [
+ "net",
+ "os-ext",
+ "os-poll"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false,
+ "tests": true
+}