commit 7eb5ca4ff4ca2f47b6936f6470d91c5e0a719968
author Andrew Walbran <qwandor@google.com> Mon Aug 08 15:33:34 2022 +0000
committer Andrew Walbran <qwandor@google.com> Fri Aug 19 10:32:26 2022 +0000
tree 402bbf66bc5869f3621daf286f24623b886d616c
parent 1b5ec6fb13a0388294b3ff665c5b7d53146eadb8

Moved binder_common to rpcbinder package under binder directory.

Bug: 234019127
Bug: 184872979
Test: atest compos_key_tests MicrodroidHostTestCases MicrodroidTestApp libbinder_rs-internal_test
Change-Id: Iceac394d2341f463362e9bbe8908e5d8a1b3f34f

compos/Android.bp

diff --git a/compos/Android.bp b/compos/Android.bp
index 0f1675b..ec2d737 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -11,7 +11,6 @@
         "compos_aidl_interface-rust",
         "libandroid_logger",
         "libanyhow",
-        "libbinder_common",
         "libbinder_rs",
         "libclap",
         "libcompos_common",
@@ -22,6 +21,7 @@
         "libodsign_proto_rust",
         "libprotobuf",
         "libregex",
+        "librpcbinder_rs",
         "librustutils",
         "libscopeguard",
     ],

compos/composd/Android.bp

diff --git a/compos/composd/Android.bp b/compos/composd/Android.bp
index 3a6119f..937aa1a 100644
--- a/compos/composd/Android.bp
+++ b/compos/composd/Android.bp
@@ -13,7 +13,6 @@
         "compos_aidl_interface-rust",
         "libandroid_logger",
         "libanyhow",
-        "libbinder_common",
         "libbinder_rs",
         "libcompos_common",
         "libcomposd_native_rust",

compos/src/compsvc_main.rs

diff --git a/compos/src/compsvc_main.rs b/compos/src/compsvc_main.rs
index 186977e..16d258e 100644
--- a/compos/src/compsvc_main.rs
+++ b/compos/src/compsvc_main.rs
@@ -29,9 +29,9 @@
     binder::Strong,
 };
 use anyhow::{bail, Context, Result};
-use binder_common::{rpc_client::connect_rpc_binder, rpc_server::run_rpc_server};
 use compos_common::COMPOS_VSOCK_PORT;
 use log::{debug, error};
+use rpcbinder::{get_vsock_rpc_interface, run_rpc_server};
 use std::panic;
 
 /// The CID representing the host VM
@@ -72,6 +72,6 @@
 }
 
 fn get_vm_service() -> Result<Strong<dyn IVirtualMachineService>> {
-    connect_rpc_binder(VMADDR_CID_HOST, VM_BINDER_SERVICE_PORT as u32)
+    get_vsock_rpc_interface(VMADDR_CID_HOST, VM_BINDER_SERVICE_PORT as u32)
         .context("Connecting to IVirtualMachineService")
 }