aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 16:50:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 16:50:08 +0000
commit0a578473001c321adcbd396c564dd065e3aab2f9 (patch)
treeb1fd20536d738e52b7de395e2cd140604dacca02
parentdf9d88eccd00e6ca2dc3f451902da5bed30baceb (diff)
parent2848e6c74d1954611369191daa74ec29d7c1f99b (diff)
downloadcrossbeam-channel-0a578473001c321adcbd396c564dd065e3aab2f9.tar.gz
Migrate to cargo_embargo. am: 94e4150511 am: 89e2452e48 am: 2848e6c74d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-channel/+/2829972 Change-Id: I9affc317579bed58a9d27b07b1b0db7b2ef82f64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json3
3 files changed, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index be32d00..1848370 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 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
+}