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

virtualizationservice/Android.bp

diff --git a/virtualizationservice/Android.bp b/virtualizationservice/Android.bp
index 0a5436b..b31d4a2 100644
--- a/virtualizationservice/Android.bp
+++ b/virtualizationservice/Android.bp
@@ -25,7 +25,6 @@
         "android.os.permissions_aidl-rust",
         "libandroid_logger",
         "libanyhow",
-        "libbinder_common",
         "libbinder_rs",
         "libcommand_fds",
         "libdisk",
@@ -38,6 +37,7 @@
         "libnix",
         "libonce_cell",
         "libregex",
+        "librpcbinder_rs",
         "librustutils",
         "libsemver",
         "libselinux_bindgen",

virtualizationservice/src/aidl.rs

diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index bba75ac..73b3ae5 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -45,7 +45,7 @@
     },
 };
 use anyhow::{anyhow, bail, Context, Result};
-use binder_common::rpc_server::run_rpc_server_with_factory;
+use rpcbinder::run_rpc_server_with_factory;
 use disk::QcowFile;
 use idsig::{HashAlgorithm, V4Signature};
 use log::{debug, error, info, warn, trace};