diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-15 19:42:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-15 19:42:29 +0000 |
| commit | e245b86f0079576a9a001a28ea0d5c7107090617 (patch) | |
| tree | 1f432b33bce93aa057324fc01813da78c7d79f45 | |
| parent | 7ecc0155a54f6dc6fbac0974d0480a68c0131c51 (diff) | |
| parent | 6c5e034ea9795fd7e3724b86a628cf1da27486b6 (diff) | |
| download | proc-macro-error-e245b86f0079576a9a001a28ea0d5c7107090617.tar.gz | |
Merge "Migrate to cargo_embargo. am: 230dba8205 am: c30bfd0017" into udc-qpr-dev-plus-aosp
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 4 | ||||
| -rw-r--r-- | cargo_embargo.json | 8 |
3 files changed, 9 insertions, 6 deletions
@@ -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 + } + } +} |