aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-21 16:23:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-21 16:23:58 +0000
commit8826728a3b5acb7bf9dd7bc4f6193800663d9d95 (patch)
tree4b3d5925d02911a7ffdcae17a10e9c0349e6c8fd
parent9afe83af3c3843d1eefc042a9b0a63a32099a6f5 (diff)
parent312b18c95f6daa064d6888944c36e2bf7656eab9 (diff)
downloadtokio-util-8826728a3b5acb7bf9dd7bc4f6193800663d9d95.tar.gz
Migrate to cargo_embargo. am: 35ab8635fb am: 95367cb21f am: 312b18c95f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-util/+/2828151 Change-Id: Ic6189faf4f83d544adcf80d90de697d58b5cfc85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json7
-rw-r--r--cargo_embargo.json7
3 files changed, 8 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 97572b5..ef96022 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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 {
default_applicable_licenses: ["external_rust_crates_tokio-util_license"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 3a811fb..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "device": true,
- "features": "full",
- "min-sdk-version": "29",
- "vendor-available": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9487e2e
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+ "features": [
+ "full"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false
+}