aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 15:29:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 15:29:15 +0000
commit4de7fa8243a2e5a438238413333948bf834e4eb8 (patch)
tree6d852d8b4a7bb85e11afce9bc02692aecd3dd3ed
parent4b65af3a6cade5590e77fb4bf332037b13218119 (diff)
parentd59043ee915f3a4e361668932821460a4cbd241f (diff)
downloadrayon-4de7fa8243a2e5a438238413333948bf834e4eb8.tar.gz
Migrate to cargo_embargo. am: d59043ee91
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rayon/+/2824415 Change-Id: I95f1f9e25a4b288a80f1a1a8dcec8eac8a40ce78 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
+}