diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-07 00:34:05 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-07 00:34:05 +0000 |
commit | dba4e5cc4abb28f4465b69bf6b4d109f92191a68 (patch) | |
tree | 1bfe266a621b097a5e3abbed7b0cf00f3d2311cd | |
parent | be37b946bcae52f40c8884ecccc7d1a94925b887 (diff) | |
parent | 127a54d0d7b4b5e3077778c8d14e5f4df19c122b (diff) | |
download | thiserror-android12--mainline-release.tar.gz |
Snap for 7343852 from 127a54d0d7b4b5e3077778c8d14e5f4df19c122b to sc-mainline-releaseandroid-mainline-12.0.0_r4android-mainline-12.0.0_r36android12--mainline-release
Change-Id: I1252281f5d199d179ab024ca4fea7f80bd07cda0
-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"] |