From 438febf9aeb3ae1f64584c3e316bde5abe74c6ed Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 7 Dec 2020 15:49:24 +0900
Subject: add crosvm to com.android.virt

To do so, crosvm and its dependencies have the apex_available property
set to "//apex_available:platform", "com.android.virt" to explicitly
acknowledge the joining.

Bug: 174639241
Test: m com.android.virt
Change-Id: If0f3b78eccaa1bea7b4de0813edd5a06ac9763c2
---
 Android.bp               |  8 ++++++--
 patches/Android.bp.patch | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 patches/Android.bp.patch

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"]
-- 
cgit v1.2.3