Move Status to libhidl (DO NOT MERGE)

Bug: 31226252

Change-Id: Ieb0adcf1fa71d6859324c2d83841685d1e1a22f8
Signed-off-by: Iliyan Malchev <malchev@google.com>

diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 132ed95..97833a0 100644 (file)
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -26,8 +26,8 @@
 #include <JNIHelp.h>
 #include <android_runtime/AndroidRuntime.h>
 #include <hidl/IServiceManager.h>
+#include <hidl/Status.h>
 #include <hwbinder/ProcessState.h>
-#include <hwbinder/Status.h>
 #include <nativehelper/ScopedLocalRef.h>
 
 #include "core_jni_helpers.h"

diff --git a/core/jni/android_os_HwBlob.cpp b/core/jni/android_os_HwBlob.cpp
index 6972cf1..b2dee06 100644 (file)
--- a/core/jni/android_os_HwBlob.cpp
+++ b/core/jni/android_os_HwBlob.cpp
@@ -24,7 +24,7 @@
 
 #include <JNIHelp.h>
 #include <android_runtime/AndroidRuntime.h>
-#include <hwbinder/Status.h>
+#include <hidl/Status.h>
 #include <nativehelper/ScopedLocalRef.h>
 
 #include "core_jni_helpers.h"

diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp
index 226d61b..d453b29 100644 (file)
--- a/core/jni/android_os_HwParcel.cpp
+++ b/core/jni/android_os_HwParcel.cpp
@@ -26,7 +26,7 @@
 
 #include <JNIHelp.h>
 #include <android_runtime/AndroidRuntime.h>
-#include <hwbinder/Status.h>
+#include <hidl/Status.h>
 #include <nativehelper/ScopedLocalRef.h>
 
 #include "core_jni_helpers.h"

diff --git a/core/jni/android_os_HwRemoteBinder.cpp b/core/jni/android_os_HwRemoteBinder.cpp
index 81ba368..3023ba8 100644 (file)
--- a/core/jni/android_os_HwRemoteBinder.cpp
+++ b/core/jni/android_os_HwRemoteBinder.cpp
@@ -25,7 +25,7 @@
 #include <JNIHelp.h>
 #include <android_runtime/AndroidRuntime.h>
 #include <hidl/IServiceManager.h>
-#include <hwbinder/Status.h>
+#include <hidl/Status.h>
 #include <nativehelper/ScopedLocalRef.h>
 
 #include "core_jni_helpers.h"