Switch compsvc to use authfs_service
With authfs_service, we no longer need compsvc_worker.rs and authfs.rs
for the task setup. Now, for each request, compsvc can just request
FDs from authfs_service then pass to the task.
Also, fixed the integer type of remote FD to match ParcelFileDescriptor.
Bug: 194717985
Test: atest ComposHostTestCases
Change-Id: I8c0be106243778ac20e7cd96a778db4e34aef051
diff --git a/compos/Android.bp b/compos/Android.bp
index ec3f67f..7f4f55c 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -30,6 +30,7 @@
name: "compsvc",
srcs: ["src/compsvc_main.rs"],
rustlibs: [
+ "authfs_aidl_interface-rust",
"compos_aidl_interface-rust",
"libandroid_logger",
"libanyhow",
@@ -49,27 +50,11 @@
}
rust_binary {
- name: "compsvc_worker",
- srcs: ["src/compsvc_worker.rs"],
- rustlibs: [
- "libandroid_logger",
- "libanyhow",
- "libclap",
- "liblog_rust",
- "libminijail_rust",
- "libnix",
- ],
- prefer_rlib: true,
- apex_available: [
- "com.android.compos",
- ],
-}
-
-rust_binary {
name: "compos_key_main",
srcs: ["src/compos_key_main.rs"],
edition: "2018",
rustlibs: [
+ "authfs_aidl_interface-rust",
"compos_aidl_interface-rust",
"android.system.keystore2-V1-rust",
"android.hardware.security.keymint-V1-rust",