aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-12-16 02:14:01 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-12-16 02:14:01 +0000
commit7f76e4ef3bd2df6534fc7eb70d087ceafa7449bc (patch)
treefe639495619e80521510418c1e2048b5ec82d823
parentf318dd02511df8a50a53dfd8fcaa06efbd670c55 (diff)
parent3ee7e52eda6b2115c2fc6b400c2c5c3c286afb90 (diff)
downloadthiserror-7f76e4ef3bd2df6534fc7eb70d087ceafa7449bc.tar.gz
Snap for 7035473 from 3ee7e52eda6b2115c2fc6b400c2c5c3c286afb90 to sc-release
Change-Id: Ibcfa0052817390bf87eb88249856ea9ce8646ea3
-rw-r--r--Android.bp8
-rw-r--r--patches/Android.bp.patch15
2 files changed, 21 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 064fc31..efeaf9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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"]