From 83c42506a73e4e52f452836a43db2f4bc5555ec5 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Fri, 19 Aug 2016 14:23:42 +0200
Subject: [PATCH] Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE)

Bug: 30839546
Change-Id: I52609576aa7f10da608725ef4ea78b778f127eef
Signed-off-by: Iliyan Malchev <malchev@google.com>
---
 core/jni/Android.mk                    | 1 +
 core/jni/android_os_HwBinder.cpp       | 2 +-
 core/jni/android_os_HwRemoteBinder.cpp | 2 +-
 core/jni/hwbinder/EphemeralStorage.h   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 8175bf67135a2..08be2eb126e0b 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -264,6 +264,7 @@ LOCAL_SHARED_LIBRARIES := \
     libradio_metadata \
     libnativeloader \
     libmemunreachable \
+    libhidl \
     libhwbinder \
 
 LOCAL_SHARED_LIBRARIES += \
diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index a45e1eef2e8f8..132ed95046561 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -25,7 +25,7 @@
 
 #include <JNIHelp.h>
 #include <android_runtime/AndroidRuntime.h>
-#include <hwbinder/IServiceManager.h>
+#include <hidl/IServiceManager.h>
 #include <hwbinder/ProcessState.h>
 #include <hwbinder/Status.h>
 #include <nativehelper/ScopedLocalRef.h>
diff --git a/core/jni/android_os_HwRemoteBinder.cpp b/core/jni/android_os_HwRemoteBinder.cpp
index 23d4fced21830..81ba368d67434 100644
--- a/core/jni/android_os_HwRemoteBinder.cpp
+++ b/core/jni/android_os_HwRemoteBinder.cpp
@@ -24,7 +24,7 @@
 
 #include <JNIHelp.h>
 #include <android_runtime/AndroidRuntime.h>
-#include <hwbinder/IServiceManager.h>
+#include <hidl/IServiceManager.h>
 #include <hwbinder/Status.h>
 #include <nativehelper/ScopedLocalRef.h>
 
diff --git a/core/jni/hwbinder/EphemeralStorage.h b/core/jni/hwbinder/EphemeralStorage.h
index 1273003e61765..b02ed9f5ea69a 100644
--- a/core/jni/hwbinder/EphemeralStorage.h
+++ b/core/jni/hwbinder/EphemeralStorage.h
@@ -19,7 +19,7 @@
 #define EPHEMERAL_STORAGE_H_
 
 #include <android-base/macros.h>
-#include <hwbinder/HidlSupport.h>
+#include <hidl/HidlSupport.h>
 #include <jni.h>
 #include <utils/Vector.h>