aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 15:59:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 15:59:05 +0000
commit4db8fb0605d9c8954fa4951290ae5e4908349414 (patch)
tree6d852d8b4a7bb85e11afce9bc02692aecd3dd3ed
parent0598fb5265c71bafcba4c094a8af9160406d4268 (diff)
parent92ac8a27d6a2a711f9dba4501d1c470393f0ec4b (diff)
downloadrayon-4db8fb0605d9c8954fa4951290ae5e4908349414.tar.gz
Migrate to cargo_embargo. am: d59043ee91 am: 92ac8a27d6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rayon/+/2824415 Change-Id: I5cf78384a7761ec9797254c2e6a80acade3c3c81 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 1a7835a..db51fec 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
+}