commit bd5002b57ce855d1467cc647ea788dc9b56502d0
author Steven Moreland <smoreland@google.com> Tue May 04 23:12:56 2021 +0000
committer Steven Moreland <smoreland@google.com> Tue May 11 01:26:16 2021 +0000
tree 4345d08af23e47514fdc946ef4a5989bef9e9187
parent 4fccd098967a1cad0a188672b801bf4e7b515079

libbinder: vsock compiles on host

Currently not tested, since connecting doesn't work. However, this helps
avoid the ifndef business.


Bug: 185269356
Test: binderRpcTest
Change-Id: I3b93e0a97e671d3d939979f00bc1e297f593a31d

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 8d10727..db7f67d 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -34,14 +34,11 @@
 #include <iostream>
 #include <thread>
 
-#ifdef __BIONIC__
-#include <linux/vm_sockets.h>
-#endif //__BIONIC__
-
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "../RpcState.h" // for debugging
+#include "../RpcState.h"   // for debugging
+#include "../vm_sockets.h" // for VMADDR_*
 
 namespace android {
 
@@ -291,19 +288,15 @@
 
 enum class SocketType {
     UNIX,
-#ifdef __BIONIC__
     VSOCK,
-#endif // __BIONIC__
     INET,
 };
 static inline std::string PrintSocketType(const testing::TestParamInfo<SocketType>& info) {
     switch (info.param) {
         case SocketType::UNIX:
             return "unix_domain_socket";
-#ifdef __BIONIC__
         case SocketType::VSOCK:
             return "vm_socket";
-#endif // __BIONIC__
         case SocketType::INET:
             return "inet_socket";
         default:
@@ -338,11 +331,9 @@
                         case SocketType::UNIX:
                             CHECK(server->setupUnixDomainServer(addr.c_str())) << addr;
                             break;
-#ifdef __BIONIC__
                         case SocketType::VSOCK:
                             CHECK(server->setupVsockServer(vsockPort));
                             break;
-#endif // __BIONIC__
                         case SocketType::INET: {
                             unsigned int outPort = 0;
                             CHECK(server->setupInetServer(0, &outPort));
@@ -376,11 +367,9 @@
                     case SocketType::UNIX:
                         if (session->setupUnixDomainClient(addr.c_str())) goto success;
                         break;
-#ifdef __BIONIC__
                     case SocketType::VSOCK:
                         if (session->setupVsockClient(VMADDR_CID_LOCAL, vsockPort)) goto success;
                         break;
-#endif // __BIONIC__
                     case SocketType::INET:
                         if (session->setupInetClient("127.0.0.1", inetPort)) goto success;
                         break;
@@ -934,9 +923,10 @@
 INSTANTIATE_TEST_CASE_P(PerSocket, BinderRpc,
                         ::testing::ValuesIn({
                                 SocketType::UNIX,
+// TODO(b/185269356): working on host
 #ifdef __BIONIC__
                                 SocketType::VSOCK,
-#endif // __BIONIC__
+#endif
                                 SocketType::INET,
                         }),
                         PrintSocketType);