diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:32:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:32:37 +0000 |
commit | 56c7b5c86cd06683feb07d93ad5b9e052ffb78f6 (patch) | |
tree | 1bfe266a621b097a5e3abbed7b0cf00f3d2311cd | |
parent | 0adb3ccc423f5afc290df160743a5f8f1e85eb78 (diff) | |
parent | 127a54d0d7b4b5e3077778c8d14e5f4df19c122b (diff) | |
download | thiserror-android12-mainline-documentsui-release.tar.gz |
Generate apex_available from c2a instead of a patch am: 84153911d3 am: b586767a94 am: 83cd478ec3 am: 127a54d0d7android-mainline-12.0.0_r9android-mainline-12.0.0_r8android-mainline-12.0.0_r7android-mainline-12.0.0_r6android-mainline-12.0.0_r58android-mainline-12.0.0_r5android-mainline-12.0.0_r48android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r12android-mainline-12.0.0_r11android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_pco_311011000aml_doc_310851020android12-mainline-statsd-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-captiveportallogin-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror/+/1689361
Change-Id: I412e7e125ff282173b0611bac6541fe862384f0e
-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"] |