diff options
| author | Jiyong Park <jiyong@google.com> | 2020-12-15 18:29:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 18:29:55 +0000 |
| commit | 5c695d45e0f9f714104c7aa5110e22b7511c31d8 (patch) | |
| tree | fe639495619e80521510418c1e2048b5ec82d823 | |
| parent | 810afffcd500db6e7bda201c5d852799605cc5ea (diff) | |
| parent | 765e3461f7e6e2cde36a335b681b85554ffc7587 (diff) | |
| download | thiserror-5c695d45e0f9f714104c7aa5110e22b7511c31d8.tar.gz | |
add crosvm to com.android.virt am: 765e3461f7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror/+/1526464
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8520eaf1aa9e701477250cd3d1bbbeba5cb784fd
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
2 files changed, 21 insertions, 2 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device. +// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch. rust_library { name: "libthiserror", @@ -7,11 +7,15 @@ rust_library { srcs: ["src/lib.rs"], edition: "2018", proc_macros: ["libthiserror_impl"], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } // dependent_library ["feature_list"] // proc-macro2-1.0.24 "default,proc-macro" // quote-1.0.7 "default,proc-macro" -// syn-1.0.48 "clone-impls,default,derive,parsing,printing,proc-macro,quote,visit" +// syn-1.0.53 "clone-impls,default,derive,parsing,printing,proc-macro,quote,visit" // thiserror-impl-1.0.22 // unicode-xid-0.2.1 "default" diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..fb3085f --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index 064fc31..985b472 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -7,6 +7,10 @@ rust_library { + srcs: ["src/lib.rs"], + edition: "2018", + proc_macros: ["libthiserror_impl"], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } + + // dependent_library ["feature_list"] |