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

Commit 02d77dcf authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: move kernel includes out of namespace" am: 5bc4bc41 am:... 

Merge "libbinder: move kernel includes out of namespace" am: 5bc4bc41 am: d51dc5e5 am: 6796f744

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

Change-Id: I0792045d7e9a56a6a4bb5ed04f00cd9d6b2b327f
parents 7f8bd973 6796f744

libs/binder/include/binder/Parcel.h

+1 −1
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ typedef unsigned int binder_size_t; 
typedef unsigned long long binder_size_t;

#endif



struct flat_binder_object;



// ---------------------------------------------------------------------------

namespace android {



template <typename T> class Flattenable;

template <typename T> class LightFlattenable;

struct flat_binder_object;

class IBinder;

class IPCThreadState;

class ProcessState;

libs/binder/include/private/binder/binder_module.h

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#ifndef _BINDER_MODULE_H_

#define _BINDER_MODULE_H_



#ifdef __cplusplus

namespace android {

#endif



/* obtain structures and constants from the kernel header */



// TODO(b/31559095): bionic on host
@@ -36,6 +32,10 @@ namespace android { 
#include <sys/ioctl.h>

#include <linux/android/binder.h>



#ifdef __cplusplus

namespace android {

#endif



#ifndef BR_FROZEN_REPLY

// Temporary definition of BR_FROZEN_REPLY. For production

// this will come from UAPI binder.h