Add authfs and fd_server to com.android.virt apex
Note that authfs is added to the "direct" apex image temporarily (instead
of microdroid) to unblock integration test within Android. Once binder
across the VM boundary is supported and authfs is updated, it should be
moved to microdroid.
Bug: 182570135
Test: TARGET_BUILD_APPS=com.android.virt m
Test: Use in integration test
Change-Id: I1fac1090ab33cc1a082fe594aa07c9f811576b55
diff --git a/apex/Android.bp b/apex/Android.bp
index 50c17f6..fa3806f 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -17,17 +17,20 @@
arch: {
arm64: {
binaries: [
+ "authfs", // TODO(victorhsieh): move to microdroid once we can run the test in VM.
"crosvm",
],
},
x86_64: {
binaries: [
+ "authfs", // TODO(victorhsieh): move to microdroid once we can run the test in VM.
"crosvm",
],
},
},
binaries: [
"assemble_cvd",
+ "fd_server",
"virtmanager",
"vm",
],
diff --git a/authfs/Android.bp b/authfs/Android.bp
index 9f7be93..4a20a0c 100644
--- a/authfs/Android.bp
+++ b/authfs/Android.bp
@@ -39,11 +39,13 @@
],
bindgen_flags: ["--size_t-is-usize"],
cflags: ["-D BORINGSSL_NO_CXX"],
+ apex_available: ["com.android.virt"],
}
rust_binary {
name: "authfs",
defaults: ["authfs_defaults"],
+ apex_available: ["com.android.virt"],
}
rust_test {
diff --git a/authfs/aidl/Android.bp b/authfs/aidl/Android.bp
index 7f3c968..35a3c4a 100644
--- a/authfs/aidl/Android.bp
+++ b/authfs/aidl/Android.bp
@@ -9,6 +9,7 @@
backend: {
rust: {
enabled: true,
+ apex_available: ["com.android.virt"],
},
},
}
diff --git a/authfs/fd_server/Android.bp b/authfs/fd_server/Android.bp
index f12f01f..6f010ce 100644
--- a/authfs/fd_server/Android.bp
+++ b/authfs/fd_server/Android.bp
@@ -13,4 +13,5 @@
"liblibc",
"liblog_rust",
],
+ apex_available: ["com.android.virt"],
}