diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-16 19:00:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 19:00:06 +0000 |
commit | 450ff5d2b2624f50fb59f9b2bca5ed92ae8f6c3f (patch) | |
tree | ee2602d0f5ce009d2aca75e0502683dbd4a82293 | |
parent | 48928be877811f047eaae45cf6d8e61f6a1e1fad (diff) | |
parent | ca1db9f032317edec560e1f29076cab3c6cfd65c (diff) | |
download | thiserror-impl-450ff5d2b2624f50fb59f9b2bca5ed92ae8f6c3f.tar.gz |
Migrate to cargo_embargo. am: ca1db9f032emu-34-3-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/2833292
Change-Id: I2ae51a74a8a18503db76e258187355a5ac0fcbe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 4 | ||||
-rw-r--r-- | cargo_embargo.json | 3 |
3 files changed, 6 insertions, 7 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 { @@ -43,9 +43,9 @@ rust_proc_macro { name: "libthiserror_impl", crate_name: "thiserror_impl", cargo_env_compat: true, - cargo_pkg_version: "1.0.40", + cargo_pkg_version: "1.0.49", srcs: ["src/lib.rs"], - edition: "2018", + edition: "2021", rustlibs: [ "libproc_macro2", "libquote", 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 +} |