aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2020-12-15 19:01:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-15 19:01:54 +0000
commit4dd54eb67e71737befa7207f038aec494aa80687 (patch)
tree3c1be36d4646739ff7a99132b27a3bcd6c51a9ed
parente2a8dfc4b9c2bc4ec72debe36a32635ea67e082d (diff)
parentdbbdfe90ffadbab9bd0cac9fb0066f527c2c7255 (diff)
downloadpin-project-4dd54eb67e71737befa7207f038aec494aa80687.tar.gz
add crosvm to com.android.virt am: 438febf9ae am: dbbdfe90ff
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1526500 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91c22b513ac9e7c1c97f55c22d60352e2ce4e605
-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 1ed91d5..ce9cdd3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch.
rust_library {
name: "libpin_project",
@@ -7,11 +7,15 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2018",
proc_macros: ["libpin_project_internal"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
// dependent_library ["feature_list"]
// pin-project-internal-1.0.2
// proc-macro2-1.0.24 "default,proc-macro"
// quote-1.0.7 "default,proc-macro"
-// syn-1.0.48 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit,visit-mut"
+// syn-1.0.53 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit,visit-mut"
// unicode-xid-0.2.1 "default"
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..e0adcd4
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,15 @@
+diff --git a/Android.bp b/Android.bp
+index 1ed91d5..16df3fc 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -7,6 +7,10 @@ rust_library {
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ proc_macros: ["libpin_project_internal"],
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.virt",
++ ],
+ }
+
+ // dependent_library ["feature_list"]