diff options
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 10 | ||||
| -rw-r--r-- | libs/binder/tests/binderLibTest.cpp | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index 518c0832c4..b1b8ff18f4 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -21,8 +21,6 @@ #include <string> #include <vector> -#include <linux/android/binder.h> - #include <android-base/unique_fd.h> #include <cutils/native_handle.h> #include <utils/Errors.h> @@ -34,11 +32,19 @@ #include <binder/IInterface.h> #include <binder/Parcelable.h> +#ifdef BINDER_IPC_32BIT +typedef __u32 binder_size_t; +#else +typedef __u64 binder_size_t; +#endif + + // --------------------------------------------------------------------------- namespace android { template <typename T> class Flattenable; template <typename T> class LightFlattenable; +struct flat_binder_object; class IBinder; class IPCThreadState; class ProcessState; diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp index 495b2f9d9a..5e0574ad8a 100644 --- a/libs/binder/tests/binderLibTest.cpp +++ b/libs/binder/tests/binderLibTest.cpp @@ -28,6 +28,7 @@ #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> +#include <private/binder/binder_module.h> #include <sys/epoll.h> #define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) |