commit 2be64f3ac443fa3df62494a63ab9a13093689d57
author Alice Wang <aliceywang@google.com> Thu Oct 13 14:37:35 2022 +0000
committer Alice Wang <aliceywang@google.com> Tue Oct 25 14:32:16 2022 +0000
tree 2613c9ee4de723df7969f17ba5a547aff9715fac
parent d534ec1b9109817f192f1dcb5bb1aac665ba72ed

[API] Wrap raw binder_rpc_unstable calls in vm_payload

Bug: 243513370
Test: atest MicrodroidTests

Change-Id: Idb1885a7c39080fd21fa6968e8bf062d935317fb

tests/testapk/Android.bp

diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index bb17058..da2c626 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -38,7 +38,6 @@
         "com.android.microdroid.testservice-ndk",
         "libbase",
         "libbinder_ndk",
-        "libbinder_rpc_unstable",
         "MicrodroidTestNativeLibSub",
         "libvm_payload",
     ],

tests/testapk/src/native/testbinary.cpp

diff --git a/tests/testapk/src/native/testbinary.cpp b/tests/testapk/src/native/testbinary.cpp
index 5d6ca8b..d57d224 100644
--- a/tests/testapk/src/native/testbinary.cpp
+++ b/tests/testapk/src/native/testbinary.cpp
@@ -30,7 +30,6 @@
 #include <vm_main.h>
 #include <vm_payload.h>
 
-#include <binder_rpc_unstable.hpp>
 #include <string>
 
 using android::base::ErrnoError;
@@ -122,8 +121,8 @@
             abort();
         }
     };
-    if (!RunVsockRpcServerCallback(testService->asBinder().get(), testService->SERVICE_PORT,
-                                   callback, nullptr)) {
+    if (!AVmPayload_runVsockRpcServer(testService->asBinder().get(), testService->SERVICE_PORT,
+                                      callback, nullptr)) {
         return Error() << "RPC Server failed to run";
     }