libkdbinder: Update includes after spliting the project

This project used to be part of `frameworks/native` but now stands on
its own. This commit updates include directives to reflect this, we
assume that this project is checked out in `frameworks/kdbinder`.
Additionally, KDBUS's header now lives under the `linux` directory.

18 files changed, 42 insertions, 38 deletions

diff --git a/include/kdbinder/binder/IPCThreadState.h b/include/kdbinder/binder/IPCThreadState.h
index e034fe7..ed5e58f 100644
--- a/include/kdbinder/binder/IPCThreadState.h
+++ b/include/kdbinder/binder/IPCThreadState.h
@@ -21,7 +21,7 @@
 #include <binder/ProcessState.h>
 #include <binder/Parcel.h>
 
-#include <kdbinder/kdbus/KDBinder.h>
+#include <kdbus/KDBinder.h>
 
 #include <utils/RefBase.h>
 #include <utils/Errors.h>
diff --git a/include/kdbinder/binder/ProcessState.h b/include/kdbinder/binder/ProcessState.h
index df8f41a..eba5bb9 100644
--- a/include/kdbinder/binder/ProcessState.h
+++ b/include/kdbinder/binder/ProcessState.h
@@ -19,7 +19,7 @@
 
 #include <binder/IBinder.h>
 
-#include <kdbinder/kdbus/KDBinder.h>
+#include <kdbus/KDBinder.h>
 
 #include <utils/RefBase.h>
 #include <utils/Mutex.h>
diff --git a/include/kdbinder/kdbus/KDBinder.h b/include/kdbinder/kdbus/KDBinder.h
index 4cbbe87..e8a00c8 100644
--- a/include/kdbinder/kdbus/KDBinder.h
+++ b/include/kdbinder/kdbus/KDBinder.h
@@ -16,9 +16,9 @@
 #ifndef INCLUDE_KDBINDER_KDBUS_KDBINDER_H_
 #define INCLUDE_KDBINDER_KDBUS_KDBINDER_H_
 
-#include <kdbinder/kdbus/bus.h>
-#include <kdbinder/kdbus/connection.h>
-#include <kdbinder/kdbus/item.h>
-#include <kdbinder/kdbus/message.h>
+#include <kdbus/bus.h>
+#include <kdbus/connection.h>
+#include <kdbus/item.h>
+#include <kdbus/message.h>
 
 #endif  // INCLUDE_KDBINDER_KDBUS_KDBINDER_H_
diff --git a/include/kdbinder/kdbus/bus.h b/include/kdbinder/kdbus/bus.h
index c582976..008943a 100644
--- a/include/kdbinder/kdbus/bus.h
+++ b/include/kdbinder/kdbus/bus.h
@@ -16,7 +16,7 @@
 #ifndef INCLUDE_KDBINDER_KDBUS_BUS_H_
 #define INCLUDE_KDBINDER_KDBUS_BUS_H_
 
-#include <kdbinder/kdbus/globals.h>
+#include <kdbus/globals.h>
 
 #include <string>
 #include <memory>
diff --git a/include/kdbinder/kdbus/connection.h b/include/kdbinder/kdbus/connection.h
index 8b76ae9..d1e4da6 100644
--- a/include/kdbinder/kdbus/connection.h
+++ b/include/kdbinder/kdbus/connection.h
@@ -16,9 +16,9 @@
 #ifndef INCLUDE_KDBINDER_KDBUS_CONNECTION_H_
 #define INCLUDE_KDBINDER_KDBUS_CONNECTION_H_
 
-#include <kdbinder/kdbus/bus.h>
-#include <kdbinder/kdbus/message.h>
-#include <kdbinder/kdbus/globals.h>
+#include <kdbus/bus.h>
+#include <kdbus/message.h>
+#include <kdbus/globals.h>
 
 // TODO: We need to include <sys/limits.h> because <vector> needs
 // CHAR_BIT defined.
diff --git a/include/kdbinder/kdbus/message.h b/include/kdbinder/kdbus/message.h
index c37ed9a..257252d 100644
--- a/include/kdbinder/kdbus/message.h
+++ b/include/kdbinder/kdbus/message.h
@@ -16,8 +16,8 @@
 #ifndef INCLUDE_KDBINDER_KDBUS_MESSAGE_H_
 #define INCLUDE_KDBINDER_KDBUS_MESSAGE_H_
 
-#include <kdbinder/kdbus/item.h>
-#include <kdbinder/kdbus/globals.h>
+#include <kdbus/item.h>
+#include <kdbus/globals.h>
 
 // TODO: We need to include <sys/limits.h> because <vector> needs
 // CHAR_BIT defined.
diff --git a/libs/kdbinder/Android.mk b/libs/kdbinder/Android.mk
index 9217c91..1d9d64c 100644
--- a/libs/kdbinder/Android.mk
+++ b/libs/kdbinder/Android.mk
@@ -33,8 +33,8 @@ kdbinder_libs := \
     libcutils \
     libutils
 kdbinder_includes := \
-    external/kdbus \
-    frameworks/native/include/kdbinder
+    external/kdbus/include/uapi \
+    frameworks/kdbinder/include/kdbinder
 
 kdbinder_cflags := -Werror -std=c++14
 kdbinder_cflags_debug := -ggdb3 -O0 -DDEBUG -UNDEBUG
diff --git a/libs/kdbinder/binder/IPCThreadState.cpp b/libs/kdbinder/binder/IPCThreadState.cpp
index 743a828..0140aae 100644
--- a/libs/kdbinder/binder/IPCThreadState.cpp
+++ b/libs/kdbinder/binder/IPCThreadState.cpp
@@ -23,7 +23,7 @@
 #include <binder/IPCThreadState.h>
 #include <binder/Parcel.h>
 
-#include <kdbinder/kdbus/KDBinder.h>
+#include <kdbus/KDBinder.h>
 
 #include <log/log.h>
 
diff --git a/libs/kdbinder/binder/IServiceManager.cpp b/libs/kdbinder/binder/IServiceManager.cpp
index 67e0274..87650fa 100644
--- a/libs/kdbinder/binder/IServiceManager.cpp
+++ b/libs/kdbinder/binder/IServiceManager.cpp
@@ -23,7 +23,7 @@
 #include <binder/ProcessState.h>
 #include <binder/Parcel.h>
 
-#include <kdbinder/kdbus/KDBinder.h>
+#include <kdbus/KDBinder.h>
 
 #include <private/binder/Static.h>
 
diff --git a/libs/kdbinder/kdbus/bus.cpp b/libs/kdbinder/kdbus/bus.cpp
index c7ef564..a62e1a2 100644
--- a/libs/kdbinder/kdbus/bus.cpp
+++ b/libs/kdbinder/kdbus/bus.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <kdbinder/kdbus/bus.h>
+#include <kdbus/bus.h>
 
 #define LOG_TAG "KDBUS::Bus"
 #include <cutils/log.h>
-#include <kdbus.h>
+#include <linux/kdbus.h>
 #include <errno.h>
 
 #include <string>
diff --git a/libs/kdbinder/kdbus/command.h b/libs/kdbinder/kdbus/command.h
index 3a77bd2..894d744 100644
--- a/libs/kdbinder/kdbus/command.h
+++ b/libs/kdbinder/kdbus/command.h
@@ -16,10 +16,10 @@
 #ifndef LIBS_KDBINDER_KDBUS_COMMAND_H_
 #define LIBS_KDBINDER_KDBUS_COMMAND_H_
 
-#include <kdbinder/kdbus/connection.h>
-#include <kdbinder/kdbus/item.h>
+#include <kdbus/connection.h>
+#include <kdbus/item.h>
 
-#include <kdbus.h>
+#include <linux/kdbus.h>
 #include <alloca.h>
 #include <errno.h>
 #include <sys/limits.h>
diff --git a/libs/kdbinder/kdbus/connection.cpp b/libs/kdbinder/kdbus/connection.cpp
index 50d06d9..94354fd 100644
--- a/libs/kdbinder/kdbus/connection.cpp
+++ b/libs/kdbinder/kdbus/connection.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <kdbinder/kdbus/connection.h>
-#include <kdbinder/kdbus/bus.h>
+#include <kdbus/connection.h>
+#include <kdbus/bus.h>
 
 #define LOG_TAG "KDBUS::Connection"
 #include <cutils/log.h>
-#include <kdbus.h>
+#include <linux/kdbus.h>
 #include <poll.h>
 #include <sys/mman.h>
 #include <errno.h>
diff --git a/libs/kdbinder/kdbus/item.cpp b/libs/kdbinder/kdbus/item.cpp
index 2351a78..3929055 100644
--- a/libs/kdbinder/kdbus/item.cpp
+++ b/libs/kdbinder/kdbus/item.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <kdbinder/kdbus/item.h>
-#include <kdbinder/kdbus/globals.h>
+#include <kdbus/item.h>
+#include <kdbus/globals.h>
 
-#include <kdbus.h>
+#include <linux/kdbus.h>
 #include <string>
 
 namespace android {
diff --git a/libs/kdbinder/kdbus/iterable.h b/libs/kdbinder/kdbus/iterable.h
index 1ac8d7c..6b87a97 100644
--- a/libs/kdbinder/kdbus/iterable.h
+++ b/libs/kdbinder/kdbus/iterable.h
@@ -16,9 +16,9 @@
 #ifndef LIBS_KDBINDER_KDBUS_ITERABLE_H_
 #define LIBS_KDBINDER_KDBUS_ITERABLE_H_
 
-#include <kdbinder/kdbus/globals.h>
+#include <kdbus/globals.h>
 
-#include <kdbus.h>
+#include <linux/kdbus.h>
 
 #include <functional>
 
diff --git a/libs/kdbinder/kdbus/message.cpp b/libs/kdbinder/kdbus/message.cpp
index 054c3d9..94161ee 100644
--- a/libs/kdbinder/kdbus/message.cpp
+++ b/libs/kdbinder/kdbus/message.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <kdbinder/kdbus/message.h>
-#include <kdbinder/kdbus/item.h>
-#include <kdbinder/kdbus/globals.h>
+#include <kdbus/message.h>
+#include <kdbus/item.h>
+#include <kdbus/globals.h>
 
-#include <kdbus.h>
+#include <linux/kdbus.h>
 
 #include <cstdlib>
 #include <ctime>
diff --git a/libs/kdbinder/tests/Android.mk b/libs/kdbinder/tests/Android.mk
index a8b6331..00660f5 100644
--- a/libs/kdbinder/tests/Android.mk
+++ b/libs/kdbinder/tests/Android.mk
@@ -30,7 +30,8 @@ LOCAL_SRC_FILES := $(kdbinderTest_sources)
 LOCAL_SHARED_LIBRARIES := libkdbinderd libutils
 LOCAL_C_INCLUDES += \
     external/gtest/include \
-    frameworks/native/include/kdbinder
+    external/kdbus/include/uapi \
+    frameworks/kdbinder/include/kdbinder
 LOCAL_CFLAGS += $(kdbinder_cflags) $(kdbinder_cflags_debug)
 include $(BUILD_NATIVE_TEST)
 
@@ -41,6 +42,9 @@ LOCAL_MODULE := kdbinderKDBUSTest
 LOCAL_MODULE_TAGS := eng
 LOCAL_SRC_FILES := $(kdbinderKDBUSTest_sources)
 LOCAL_SHARED_LIBRARIES := libkdbinderd
-LOCAL_C_INCLUDES += external/gtest/include
+LOCAL_C_INCLUDES += \
+    external/gtest/include \
+    external/kdbus/include/uapi \
+    frameworks/kdbinder/include/kdbinder
 LOCAL_CFLAGS += $(kdbinder_cflags) $(kdbinder_cflags_debug)
 include $(BUILD_NATIVE_TEST)
diff --git a/libs/kdbinder/tests/kdbus/bus.cpp b/libs/kdbinder/tests/kdbus/bus.cpp
index 1bd5462..3c67d9b 100644
--- a/libs/kdbinder/tests/kdbus/bus.cpp
+++ b/libs/kdbinder/tests/kdbus/bus.cpp
@@ -16,7 +16,7 @@
  */
 #include <gtest/gtest.h>
 
-#include <kdbinder/kdbus/bus.h>
+#include <kdbus/bus.h>
 
 using Bus = android::kdbus::Bus;
 
diff --git a/libs/kdbinder/tests/kdbus/connection.cpp b/libs/kdbinder/tests/kdbus/connection.cpp
index b3e9702..54bd113 100644
--- a/libs/kdbinder/tests/kdbus/connection.cpp
+++ b/libs/kdbinder/tests/kdbus/connection.cpp
@@ -16,8 +16,8 @@
  */
 #include <gtest/gtest.h>
 
-#include <kdbinder/kdbus/bus.h>
-#include <kdbinder/kdbus/connection.h>
+#include <kdbus/bus.h>
+#include <kdbus/connection.h>
 
 #include <thread>