diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:18 +0000 |
commit | 203c1197dd87b6f4e4d29d601da15e57c193816f (patch) | |
tree | 1bfe266a621b097a5e3abbed7b0cf00f3d2311cd | |
parent | be37b946bcae52f40c8884ecccc7d1a94925b887 (diff) | |
parent | 127a54d0d7b4b5e3077778c8d14e5f4df19c122b (diff) | |
download | thiserror-android12L-d2-s4-release.tar.gz |
Generate apex_available from c2a instead of a patch am: 84153911d3 am: b586767a94 am: 83cd478ec3 am: 127a54d0d7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror/+/1689361
Change-Id: Icb10016006b2b22b91c46c71f9e091c27890439d
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 12 insertions, 18 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -51,8 +51,8 @@ rust_library { } // dependent_library ["feature_list"] -// proc-macro2-1.0.24 "default,proc-macro" +// proc-macro2-1.0.26 "default,proc-macro" // quote-1.0.9 "default,proc-macro" -// syn-1.0.60 "clone-impls,default,derive,parsing,printing,proc-macro,quote" +// syn-1.0.71 "clone-impls,default,derive,parsing,printing,proc-macro,quote" // thiserror-impl-1.0.24 // unicode-xid-0.2.1 "default" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..42b7833 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index fb3085f..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -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"] |