aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:48:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:48:47 +0000
commitf3c720cef214709cab13fa6896b7869919996960 (patch)
tree112d7086a79dc79a19844efeca15a2ce0140305c
parentce6a773e5db80859c3ba9122a92e844295717529 (diff)
parent354adf354dfdc288f7d09f04c1ef10eec8b9a6fd (diff)
downloaditertools-f3c720cef214709cab13fa6896b7869919996960.tar.gz
Migrate to cargo_embargo. am: b71722ff58 am: 3205c21f66 am: 354adf354d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/itertools/+/2796435 Change-Id: I69309d1be02a40297fa5cf908aa3828be5d342f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json3
3 files changed, 5 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 0d022a8..ef7349d 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 {
@@ -50,9 +50,7 @@ rust_library {
"use_alloc",
"use_std",
],
- rustlibs: [
- "libeither",
- ],
+ rustlibs: ["libeither"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "device": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}