summaryrefslogtreecommitdiff
path: root/libs/binder/RpcServer.cpp
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2021-05-11 16:50:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-05-11 16:50:29 +0000
commitfc87fc210a1cc37d77cce8ec8f4284ddb017b0b8 (patch)
treebd1f9a86539bb8f89e2d1bb7a24f82807dbe6930 /libs/binder/RpcServer.cpp
parent88cf4b21ae06941755839a15fb93a83d7738c7e8 (diff)
parent94a9ae334ed3c4690a3fc9d3d1ea7180784bcdf3 (diff)
Merge changes I9b5b2876,I3b93e0a9 am: 94a9ae334e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1697653 Change-Id: I05b63b429cd2da1f2ed5856a4d2d1593feac7484
Diffstat (limited to 'libs/binder/RpcServer.cpp')
-rw-r--r--libs/binder/RpcServer.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp
index e9186f0e22..a6850ff6aa 100644
--- a/libs/binder/RpcServer.cpp
+++ b/libs/binder/RpcServer.cpp
@@ -49,8 +49,6 @@ bool RpcServer::setupUnixDomainServer(const char* path) {
return setupSocketServer(UnixSocketAddress(path));
}
-#ifdef __BIONIC__
-
bool RpcServer::setupVsockServer(unsigned int port) {
// realizing value w/ this type at compile time to avoid ubsan abort
constexpr unsigned int kAnyCid = VMADDR_CID_ANY;
@@ -58,8 +56,6 @@ bool RpcServer::setupVsockServer(unsigned int port) {
return setupSocketServer(VsockSocketAddress(kAnyCid, port));
}
-#endif // __BIONIC__
-
bool RpcServer::setupInetServer(unsigned int port, unsigned int* assignedPort) {
const char* kAddr = "127.0.0.1";