diff options
| author | Matthew Maurer <mmaurer@google.com> | 2022-09-08 14:03:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-08 14:03:47 +0000 |
| commit | 0d86f3396e444f0afc0e3b5a3d8ef35154c95869 (patch) | |
| tree | 69252e9b0c886a97ea1731e987dbcb026cf89847 | |
| parent | eb057d37dae3aee64c916c065121736be637e7e5 (diff) | |
| parent | 8dac7e38b2be2034571925cb1f363ad3fd619de6 (diff) | |
| download | argh_derive-0d86f3396e444f0afc0e3b5a3d8ef35154c95869.tar.gz | |
Use libheck-0.3.3 am: 373aa01313 am: 799174cddf am: 4b4a5f5137 am: 37d148326e am: 8dac7e38b2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/argh_derive/+/2210635
Change-Id: Ib7c7c1c7fd4a82fa51684a61b2cd98ff233153bf
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 | 5 | ||||
| -rw-r--r-- | patches/0001-Use-libheck-0.3.3.patch | 28 |
3 files changed, 35 insertions, 4 deletions
@@ -1,8 +1,6 @@ -// This file is generated by cargo2android.py --run --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. - - package { default_applicable_licenses: ["external_rust_crates_argh_derive_license"], } @@ -29,7 +27,7 @@ rust_proc_macro { edition: "2018", rustlibs: [ "libargh_shared", - "libheck", + "libheck_deprecated", "libproc_macro2", "libquote", "libsyn", diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..4456e1f --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "run": true, + "device": true, + "patch": "patches/0001-Use-libheck-0.3.3.patch" +} diff --git a/patches/0001-Use-libheck-0.3.3.patch b/patches/0001-Use-libheck-0.3.3.patch new file mode 100644 index 0000000..e43b4c0 --- /dev/null +++ b/patches/0001-Use-libheck-0.3.3.patch @@ -0,0 +1,28 @@ +From 5dd441921a3868023533fa6818b425660232cdad Mon Sep 17 00:00:00 2001 +From: Matthew Maurer <mmaurer@google.com> +Date: Wed, 7 Sep 2022 16:10:32 -0700 +Subject: [PATCH] Use libheck 0.3.3 + +Upstream has not yet migrated to 0.4. + +Change-Id: I0b7ccbb4b33ae77c88da6697562d0b7e8582e728 +--- + Android.bp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Android.bp b/Android.bp +index 1d3fdfe..54e460b 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -29,7 +29,7 @@ rust_proc_macro { + edition: "2018", + rustlibs: [ + "libargh_shared", +- "libheck", ++ "libheck_deprecated", + "libproc_macro2", + "libquote", + "libsyn", +-- +2.37.2.789.g6183377224-goog + |