Use local copy of vm_sockets.h on non-Trusty for portability

This uses binder's copy of the vm_sockets.h header for the definition of
vsock types and constants. This header is more portable as it works on
non-bionic based Linux systems and non-Linux systems that use compatible
types and constants.

Change-Id: I95171de08726754578ba00b4fb19524b9140afdb

1 files changed, 2 insertions, 5 deletions

diff --git a/libs/binder/libbinder_rpc_unstable.cpp b/libs/binder/libbinder_rpc_unstable.cpp
index a84a0c6e0b..64b1be25d2 100644
--- a/libs/binder/libbinder_rpc_unstable.cpp
+++ b/libs/binder/libbinder_rpc_unstable.cpp
@@ -23,11 +23,8 @@
 
 #ifndef __TRUSTY__
 #include <cutils/sockets.h>
-#endif
-
-#ifdef __linux__
-#include <linux/vm_sockets.h>
-#endif // __linux__
+#include "vm_sockets.h"
+#endif  // !__TRUSTY__
 
 using android::OK;
 using android::RpcServer;