Merge "libbinder: stop exporting kernel headers" am: 1de74a7c7c am: 3bb28061db (e663423a) · Commits · e / os / platform_frameworks_native

libs/binder/include/binder/Parcel.h

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,6 @@
	#include <string>		#include <string>
	#include <vector>		#include <vector>

	#include <linux/android/binder.h>

	#include <android-base/unique_fd.h>		#include <android-base/unique_fd.h>
	#include <cutils/native_handle.h>		#include <cutils/native_handle.h>
	#include <utils/Errors.h>		#include <utils/Errors.h>
	@@ -34,11 +32,19 @@
	#include <binder/IInterface.h>		#include <binder/IInterface.h>
	#include <binder/Parcelable.h>		#include <binder/Parcelable.h>

			#ifdef BINDER_IPC_32BIT
			typedef __u32 binder_size_t;
			#else
			typedef __u64 binder_size_t;
			#endif


	// ---------------------------------------------------------------------------		// ---------------------------------------------------------------------------
	namespace android {		namespace android {

	template <typename T> class Flattenable;		template <typename T> class Flattenable;
	template <typename T> class LightFlattenable;		template <typename T> class LightFlattenable;
			struct flat_binder_object;
	class IBinder;		class IBinder;
	class IPCThreadState;		class IPCThreadState;
	class ProcessState;		class ProcessState;

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@
	#include <binder/IPCThreadState.h>		#include <binder/IPCThreadState.h>
	#include <binder/IServiceManager.h>		#include <binder/IServiceManager.h>

			#include <private/binder/binder_module.h>
	#include <sys/epoll.h>		#include <sys/epoll.h>

	#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])		#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])