commit da53c5ea942ac9a7b6d4198fd82fd2b957ac300e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 13 14:04:35 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 13 14:04:35 2024 -0800
tree 4c862732ba8683c82c322f7caacee130249b0072
parent 74360add4465891fd5a6647f8bba6c3d0e9cc51a
parent aee4e9d7b750d88b048ae74e371e2859a788fdc6

Merge "Use local copy of vm_sockets.h on non-Trusty for portability" into main

libs/binder/libbinder_rpc_unstable.cpp

diff --git a/libs/binder/libbinder_rpc_unstable.cpp b/libs/binder/libbinder_rpc_unstable.cpp
index a84a0c6..64b1be2 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;