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

Commit 173b3eff authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge \"Change to include linux/android/binder.h.\" 

am: b34400ea

Change-Id: I1aab76bd51c448410d1d9ff3ae288013c81c8d52
parents 0a9a1c1b b34400ea

cmds/servicemanager/binder.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define _BINDER_H_



#include <sys/ioctl.h>

#include <linux/binder.h>

#include <linux/android/binder.h>



struct binder_state;

include/binder/Parcel.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <utils/String16.h>

#include <utils/Vector.h>

#include <utils/Flattenable.h>

#include <linux/binder.h>

#include <linux/android/binder.h>



#include <binder/IInterface.h>

#include <binder/Parcelable.h>

include/private/binder/binder_module.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ namespace android { 
/* obtain structures and constants from the kernel header */



#include <sys/ioctl.h>

#include <linux/binder.h>

#include <linux/android/binder.h>



#ifdef __cplusplus

}   // namespace android