aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 09:23:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 09:23:01 +0000
commit01712417b3a40242b54a509759eb389601d35d48 (patch)
tree717ab1b8d0bd6fffe74cd56a337eeb28416f54f1
parentf7554bb7c14986bdb415eb06c52b641d5a9e655f (diff)
parent54cf2a582629f8f7a1ec8be1cd364b208398968e (diff)
downloadno-panic-01712417b3a40242b54a509759eb389601d35d48.tar.gz
Migrate to cargo_embargo. am: 1587f3726d am: 54cf2a5826
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/no-panic/+/2828067 Change-Id: I2aef53e8a983ed77e33358a1af27a4b15f477466 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.json9
3 files changed, 10 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index baccb1a..45707e2 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 bb77633..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "host-first-multilib": 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..e1d0b7d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "package": {
+ "no-panic": {
+ "device_supported": false,
+ "host_first_multilib": true
+ }
+ },
+ "run_cargo": false
+}