diff options
author | Steven Moreland <smoreland@google.com> | 2019-09-17 15:30:29 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-17 15:30:29 -0700 |
commit | dd9b1e9cde2a437125650b357e656ca66f4ed5da (patch) | |
tree | 163aa1fd7ba7cfe92c175f439f1ec5b9b749421a | |
parent | b8267af550e6d19923432a7907b204682b59b93c (diff) | |
parent | 675fd5f9f15ea50c51d33538bd6aa308546be35b (diff) | |
download | libhwbinder-dd9b1e9cde2a437125650b357e656ca66f4ed5da.tar.gz |
Merge "stop exporting kernel headers" am: 4f35e0bc27 am: 23680bd41d am: 9c53e8a3d1
am: 675fd5f9f1
Change-Id: I822bf81f4e07b7296c42be64f9b14a1b1d2d27db
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | IPCThreadState.cpp | 3 | ||||
-rw-r--r-- | Parcel.cpp | 3 | ||||
-rw-r--r-- | ProcessState.cpp | 3 | ||||
-rw-r--r-- | binder_kernel.h (renamed from include/hwbinder/binder_kernel.h) | 0 | ||||
-rw-r--r-- | include/hwbinder/Parcel.h | 11 |
6 files changed, 12 insertions, 9 deletions
@@ -16,7 +16,6 @@ cc_defaults { name: "libhwbinder_defaults", export_include_dirs: ["include"], - include_dirs: ["frameworks/native/include"], sanitize: { misc_undefined: ["integer"], diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp index a87b5f4..e176890 100644 --- a/IPCThreadState.cpp +++ b/IPCThreadState.cpp @@ -22,7 +22,6 @@ #include <hwbinder/Binder.h> #include <hwbinder/BpHwBinder.h> #include <hwbinder/TextOutput.h> -#include <hwbinder/binder_kernel.h> #include <android-base/macros.h> #include <utils/CallStack.h> @@ -30,7 +29,7 @@ #include <utils/SystemClock.h> #include <utils/threads.h> -#include <private/binder/binder_module.h> +#include "binder_kernel.h" #include <hwbinder/Static.h> #include <atomic> @@ -36,7 +36,6 @@ #include <hwbinder/Parcel.h> #include <hwbinder/ProcessState.h> #include <hwbinder/TextOutput.h> -#include <hwbinder/binder_kernel.h> #include <cutils/ashmem.h> #include <utils/Debug.h> @@ -45,7 +44,7 @@ #include <utils/String8.h> #include <utils/String16.h> -#include <private/binder/binder_module.h> +#include "binder_kernel.h" #include <hwbinder/Static.h> #ifndef INT32_MAX diff --git a/ProcessState.cpp b/ProcessState.cpp index e652a44..c0cf21a 100644 --- a/ProcessState.cpp +++ b/ProcessState.cpp @@ -21,12 +21,11 @@ #include <cutils/atomic.h> #include <hwbinder/BpHwBinder.h> #include <hwbinder/IPCThreadState.h> -#include <hwbinder/binder_kernel.h> #include <utils/Log.h> #include <utils/String8.h> #include <utils/threads.h> -#include <private/binder/binder_module.h> +#include "binder_kernel.h" #include <hwbinder/Static.h> #include <errno.h> diff --git a/include/hwbinder/binder_kernel.h b/binder_kernel.h index 9d9ed70..9d9ed70 100644 --- a/include/hwbinder/binder_kernel.h +++ b/binder_kernel.h diff --git a/include/hwbinder/Parcel.h b/include/hwbinder/Parcel.h index 6714362..63a8475 100644 --- a/include/hwbinder/Parcel.h +++ b/include/hwbinder/Parcel.h @@ -25,16 +25,23 @@ #include <utils/RefBase.h> #include <utils/String16.h> -#include <linux/android/binder.h> - #include <hwbinder/IInterface.h> struct binder_buffer_object; +struct flat_binder_object; // --------------------------------------------------------------------------- namespace android { namespace hardware { +#ifdef BINDER_IPC_32BIT +typedef __u32 binder_size_t; +typedef __u32 binder_uintptr_t; +#else +typedef __u64 binder_size_t; +typedef __u64 binder_uintptr_t; +#endif + class IBinder; class IPCThreadState; class ProcessState; |