commit 1a5d6acc89215b46cec3521c1b5f3c222cdc5386
author Alice Wang <aliceywang@google.com> Mon Oct 17 07:43:31 2022 +0000
committer Alice Wang <aliceywang@google.com> Wed Oct 26 07:24:32 2022 +0000
tree f89983bf58c449a8e3312655310425032a3e43c7
parent 98e8be9ea8cb53252b1bc0887d7f94d44a72728b

[API] Run vsock RPC server with vm_payload API for benchmarks

Bug: 243513370
Test: atest MicrodroidBenchmarks
Change-Id: I9e05b5e8b0d90e968d4c82528084e5c1bde6de7b

tests/benchmark/Android.bp

diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp
index 88e4d41..2ba3881 100644
--- a/tests/benchmark/Android.bp
+++ b/tests/benchmark/Android.bp
@@ -45,7 +45,6 @@
         "com.android.microdroid.testservice-ndk",
         "libbase",
         "libbinder_ndk",
-        "libbinder_rpc_unstable",
         "liblog",
         "libvm_payload",
     ],

tests/benchmark/src/native/benchmarkbinary.cpp

diff --git a/tests/benchmark/src/native/benchmarkbinary.cpp b/tests/benchmark/src/native/benchmarkbinary.cpp
index c394756..24712b1 100644
--- a/tests/benchmark/src/native/benchmarkbinary.cpp
+++ b/tests/benchmark/src/native/benchmarkbinary.cpp
@@ -29,7 +29,6 @@
 #include <vm_main.h>
 #include <vm_payload.h>
 
-#include <binder_rpc_unstable.hpp>
 #include <fstream>
 #include <random>
 #include <string>
@@ -164,9 +163,8 @@
             abort();
         }
     };
-
-    if (!RunVsockRpcServerCallback(test_service->asBinder().get(), test_service->SERVICE_PORT,
-                                   callback, nullptr)) {
+    if (!AVmPayload_runVsockRpcServer(test_service->asBinder().get(), test_service->SERVICE_PORT,
+                                      callback, nullptr)) {
         return Error() << "RPC Server failed to run";
     }
     return {};