diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-03 20:25:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-03 20:25:14 +0000 |
| commit | fa1f34313766d94e8a85495ebb686fe2143a2116 (patch) | |
| tree | 95b343dd0d23efd6e7cd20ad3f1d95a5c725dfa5 | |
| parent | b39c94ee3e9df532d310c2c3fccfdd80480bd824 (diff) | |
| parent | b75672eec4b2c005508e830b4ba86dd1096036bd (diff) | |
| download | anyhow-fa1f34313766d94e8a85495ebb686fe2143a2116.tar.gz | |
Use new c2a functionality instead of a patch. am: b75672eec4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/anyhow/+/1725491
Change-Id: I337715f0a8708755e915e3f127ffc097e1f13013
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 28 |
3 files changed, 9 insertions, 33 deletions
@@ -286,17 +286,17 @@ rust_library { // lazy_static-1.4.0 // pin-project-lite-0.2.6 // pin-utils-0.1.0 -// proc-macro2-1.0.26 "default,proc-macro" +// proc-macro2-1.0.27 "default,proc-macro" // quote-1.0.9 "default,proc-macro" -// rustversion-1.0.4 +// rustversion-1.0.5 // ryu-1.0.5 // serde-1.0.126 "default,derive,serde_derive,std" // serde_derive-1.0.126 "default" // serde_json-1.0.64 "default,std" // syn-1.0.72 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" // termcolor-1.1.2 -// thiserror-1.0.24 -// thiserror-impl-1.0.24 +// thiserror-1.0.25 +// thiserror-impl-1.0.25 // toml-0.5.8 "default" // trybuild-1.0.42 "diff,dissimilar" // unicode-xid-0.2.2 "default" diff --git a/cargo2android.json b/cargo2android.json index 655ebd1..0d92165 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,8 +7,12 @@ ], "min_sdk_version": "29", "dependencies": true, + "dependency-blocklist": [ + "rustversion", + "syn", + "trybuild" + ], "device": true, - "patch": "patches/Android.bp.diff", "run": true, "tests": true }
\ No newline at end of file diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 3745bac..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 1099708..a2e3476 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -54,11 +54,8 @@ rust_defaults { - ], - rustlibs: [ - "libfutures", -- "libsyn", - "libthiserror", -- "libtrybuild", - ], -- proc_macros: ["librustversion"], - } - - rust_test_host { -@@ -91,11 +88,8 @@ rust_defaults { - rustlibs: [ - "libanyhow", - "libfutures", -- "libsyn", - "libthiserror", -- "libtrybuild", - ], -- proc_macros: ["librustversion"], - } - - rust_test_host { |