remove dependencies related to the binding of android.

This dependency is not completely removed here for suppored other devices.
This binding feature must be replaced as d-bus of tizen and shared memory of tizen.

Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>

diff --git a/experiments/android_nn/nn/depend/libc/kernel/uapi/linux/android/binder.h b/experiments/android_nn/nn/depend/libc/kernel/uapi/linux/android/binder.h
index 5a7929f..1e7f436 100644 (file)
--- a/experiments/android_nn/nn/depend/libc/kernel/uapi/linux/android/binder.h
+++ b/experiments/android_nn/nn/depend/libc/kernel/uapi/linux/android/binder.h
@@ -105,7 +105,7 @@ struct binder_ptr_cookie {
 struct binder_handle_cookie {
   __u32 handle;
   binder_uintptr_t cookie;
-} __packed;
+};
 struct binder_pri_desc {
   __s32 priority;
   __u32 desc;

diff --git a/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp b/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp
index dc4b0e1..295861e 100644 (file)
--- a/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp
+++ b/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp
@@ -26,8 +26,13 @@
 #include <utils/Log.h>
 #include <utils/SystemClock.h>
 #include <utils/threads.h>
+#include <cutils/threads.h>
 
-#include <private/binder/binder_module.h>
+//#include <private/binder/binder_module.h>
+namespace android {
+#include <sys/ioctl.h>
+#include <linux/android/binder.h>
+};
 #include <hwbinder/Static.h>
 
 #include <errno.h>

diff --git a/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp b/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp
index 59a4686..05306ef 100644 (file)
--- a/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp
+++ b/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp
@@ -45,7 +45,11 @@
 #include <utils/String8.h>
 #include <utils/String16.h>
 
-#include <private/binder/binder_module.h>
+//#include <private/binder/binder_module.h>
+namespace android {
+#include <sys/ioctl.h>
+#include <linux/android/binder.h>
+};
 #include <hwbinder/Static.h>
 
 #ifndef INT32_MAX

diff --git a/experiments/android_nn/nn/depend/libhwbinder/ProcessState.cpp b/experiments/android_nn/nn/depend/libhwbinder/ProcessState.cpp
index 16bbd4d..1bc9a59 100644 (file)
--- a/experiments/android_nn/nn/depend/libhwbinder/ProcessState.cpp
+++ b/experiments/android_nn/nn/depend/libhwbinder/ProcessState.cpp
@@ -26,9 +26,13 @@
 #include <utils/String8.h>
 #include <utils/threads.h>
 
-#include <private/binder/binder_module.h>
-#include <hwbinder/Static.h>
+//#include <private/binder/binder_module.h>
+namespace android {
+#include <sys/ioctl.h>
+#include <linux/android/binder.h>
+};
 
+#include <hwbinder/Static.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>

diff --git a/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Parcel.h b/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Parcel.h
index debffa3..ae77c79 100644 (file)
--- a/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Parcel.h
+++ b/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Parcel.h
@@ -19,6 +19,7 @@
 
 #include <string>
 #include <vector>
+#include <memory>
 
 #include <android-base/unique_fd.h>
 #include <cutils/native_handle.h>

diff --git a/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/binder_kernel.h b/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/binder_kernel.h
index bf94a57..b3c9181 100644 (file)
--- a/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/binder_kernel.h
+++ b/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/binder_kernel.h
@@ -17,7 +17,7 @@
 #ifndef ANDROID_HARDWARE_BINDER_KERNEL_H
 #define ANDROID_HARDWARE_BINDER_KERNEL_H
 
-#include <linux/android/binder.h>
+//#include <linux/android/binder.h>
 
 /**
  * This file exists because the uapi kernel headers in bionic are built