summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martijn Coenen <maco@google.com> 2016-09-01 01:37:05 +0200
committer Iliyan Malchev <malchev@google.com> 2016-09-02 06:28:14 -0700
commitaa2c32f92b199cb40b808554ced67af1edaffef5 (patch)
tree595771bc412ece10532dc76f9b3493bc5db6ecdc
parent9266f9928d5b3431982cd04f4d6946b70f40766a (diff)
Move Status to libhidl (DO NOT MERGE)
Bug: 31226252 Change-Id: Ieb0adcf1fa71d6859324c2d83841685d1e1a22f8 Signed-off-by: Iliyan Malchev <malchev@google.com>
-rw-r--r--core/jni/android_os_HwBinder.cpp2
-rw-r--r--core/jni/android_os_HwBlob.cpp2
-rw-r--r--core/jni/android_os_HwParcel.cpp2
-rw-r--r--core/jni/android_os_HwRemoteBinder.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 132ed9504656..97833a078f4c 100644
--- 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 6972cf120969..b2dee0689ee0 100644
--- 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 226d61ba57f3..d453b29c0663 100644
--- 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 81ba368d6743..3023ba87d24b 100644
--- 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"