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

vmclient/Android.bp

diff --git a/vmclient/Android.bp b/vmclient/Android.bp
index c219198..213125e 100644
--- a/vmclient/Android.bp
+++ b/vmclient/Android.bp
@@ -9,9 +9,9 @@
     edition: "2021",
     rustlibs: [
         "android.system.virtualizationservice-rust",
-        "libbinder_common",
         "libbinder_rs",
         "liblog_rust",
+        "librpcbinder_rs",
         "libthiserror",
     ],
     shared_libs: [

vmclient/src/lib.rs

diff --git a/vmclient/src/lib.rs b/vmclient/src/lib.rs
index 129e6c3..16b5d5a 100644
--- a/vmclient/src/lib.rs
+++ b/vmclient/src/lib.rs
@@ -35,8 +35,8 @@
         ParcelFileDescriptor, Result as BinderResult, StatusCode, Strong,
     },
 };
-use binder_common::rpc_client::connect_preconnected_rpc_binder;
 use log::warn;
+use rpcbinder::get_preconnected_rpc_interface;
 use std::{
     fmt::{self, Debug, Formatter},
     fs::File,
@@ -174,7 +174,7 @@
         &self,
         port: u32,
     ) -> Result<Strong<T>, StatusCode> {
-        connect_preconnected_rpc_binder(|| {
+        get_preconnected_rpc_interface(|| {
             match self.vm.connectVsock(port as i32) {
                 Ok(vsock) => {
                     // Ownership of the fd is transferred to binder