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

authfs/Android.bp

diff --git a/authfs/Android.bp b/authfs/Android.bp
index cb7f119..4c5b70e 100644
--- a/authfs/Android.bp
+++ b/authfs/Android.bp
@@ -14,7 +14,6 @@
         "libandroid_logger",
         "libanyhow",
         "libauthfs_fsverity_metadata",
-        "libbinder_common",
         "libbinder_rs",
         "libcfg_if",
         "libfsverity_digests_proto_rust",
@@ -24,6 +23,7 @@
         "libnix",
         "libopenssl",
         "libprotobuf",
+        "librpcbinder_rs",
         "libstructopt",
         "libthiserror",
     ],

authfs/fd_server/Android.bp

diff --git a/authfs/fd_server/Android.bp b/authfs/fd_server/Android.bp
index 943eec1..44407a2 100644
--- a/authfs/fd_server/Android.bp
+++ b/authfs/fd_server/Android.bp
@@ -10,12 +10,12 @@
         "libandroid_logger",
         "libanyhow",
         "libauthfs_fsverity_metadata",
-        "libbinder_common",
         "libbinder_rs",
         "libclap",
         "liblibc",
         "liblog_rust",
         "libnix",
+        "librpcbinder_rs",
     ],
     prefer_rlib: true,
     shared_libs: [

authfs/fd_server/src/main.rs

diff --git a/authfs/fd_server/src/main.rs b/authfs/fd_server/src/main.rs
index a1d09fc..23a76e2 100644
--- a/authfs/fd_server/src/main.rs
+++ b/authfs/fd_server/src/main.rs
@@ -27,9 +27,9 @@
 mod fsverity;
 
 use anyhow::{bail, Result};
-use binder_common::rpc_server::run_rpc_server;
 use log::debug;
 use nix::sys::stat::{umask, Mode};
+use rpcbinder::run_rpc_server;
 use std::collections::BTreeMap;
 use std::fs::File;
 use std::os::unix::io::FromRawFd;

authfs/src/file.rs

diff --git a/authfs/src/file.rs b/authfs/src/file.rs
index df52a0e..aff47c5 100644
--- a/authfs/src/file.rs
+++ b/authfs/src/file.rs
@@ -9,7 +9,7 @@
 use crate::common::{divide_roundup, CHUNK_SIZE};
 use authfs_aidl_interface::aidl::com::android::virt::fs::IVirtFdService::IVirtFdService;
 use binder::{Status, StatusCode, Strong};
-use binder_common::rpc_client::connect_rpc_binder;
+use rpcbinder::get_vsock_rpc_interface;
 use std::convert::TryFrom;
 use std::io;
 use std::path::{Path, MAIN_SEPARATOR};
@@ -22,7 +22,7 @@
 pub const RPC_SERVICE_PORT: u32 = 3264;
 
 pub fn get_rpc_binder_service(cid: u32) -> io::Result<VirtFdService> {
-    connect_rpc_binder(cid, RPC_SERVICE_PORT).map_err(|e| match e {
+    get_vsock_rpc_interface(cid, RPC_SERVICE_PORT).map_err(|e| match e {
         StatusCode::BAD_VALUE => {
             io::Error::new(io::ErrorKind::InvalidInput, "Invalid raw AIBinder")
         }