aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 19:11:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 19:11:19 +0000
commitc30bfd0017f78f5b4a962a45cf448eb6a0e05f23 (patch)
tree1f432b33bce93aa057324fc01813da78c7d79f45
parent434f0d31302ab424c2023a6ac32e90b81e52bfbd (diff)
parent230dba8205e6f65e401786f4082a7e55b11cc8ee (diff)
downloadproc-macro-error-master.tar.gz
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/2830432 Change-Id: Ib05b797267df99622a3354d7514e60d102ef23e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 6b63814..4715ffb 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 {
@@ -41,7 +41,6 @@ license {
rust_library_host {
name: "libproc_macro_error",
- // has rustc warnings
crate_name: "proc_macro_error",
cargo_env_compat: true,
cargo_pkg_version: "1.0.4",
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..887288a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "package": {
+ "proc-macro-error": {
+ "device_supported": false,
+ "host_first_multilib": true
+ }
+ }
+}