aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 00:52:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 00:52:07 +0000
commit0c4816e924365d367125a0da19843c481fa90ba8 (patch)
treee41706de282a14c3b334590032cff5be83e69516
parent5f640225322343c2adb5c9a2440bec536075abe9 (diff)
parentfe0b55a60e98a89a83004413ece5fb156245b985 (diff)
downloadrayon-core-0c4816e924365d367125a0da19843c481fa90ba8.tar.gz
Migrate to cargo_embargo. am: 2db8ca8f4b am: 76cd97482d am: fe0b55a60e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rayon-core/+/2824511 Change-Id: I37dbeaa3b9103bb57fbd9741b9a5cd9645d7fcf1 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 54886c4..64d1452 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
+}