aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2020-12-07 15:52:02 +0900
committerJiyong Park <jiyong@google.com>2020-12-14 16:09:39 +0900
commit69084b12689daa86fdcb28da45dcebc7e63503b8 (patch)
tree5eea48913e8cf050cfccf611e6805567f4096943
parentaa1eb11756f95ab395920e66be2573010df23020 (diff)
downloadslab-69084b12689daa86fdcb28da45dcebc7e63503b8.tar.gz
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: Id707fca5e45091018712ce58fc4aeae11807381d
-rw-r--r--Android.bp6
-rw-r--r--patches/Android.bp.patch15
2 files changed, 20 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 81236b0..d978ec2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies.
+// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch.
rust_library {
name: "libslab",
@@ -6,6 +6,10 @@ rust_library {
crate_name: "slab",
srcs: ["src/lib.rs"],
edition: "2015",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_defaults {
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..acfab60
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,15 @@
+diff --git a/Android.bp b/Android.bp
+index 81236b0..18997c4 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -6,6 +6,10 @@ rust_library {
+ crate_name: "slab",
+ srcs: ["src/lib.rs"],
+ edition: "2015",
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.virt",
++ ],
+ }
+
+ rust_defaults {