Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7749c638 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Use local copy of vm_sockets.h on non-Trusty for portability" into main am: da53c5ea am: 12e7a21e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3409621



Change-Id: Idd1b85c1e66bf24bc3dbdbe9548aa14af0fefca5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9713197 12e7a21e

libs/binder/libbinder_rpc_unstable.cpp

+2 −5
Original line number Diff line number Diff line
@@ -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;