Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE)

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

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 8175bf6..08be2eb 100644 (file)
--- 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 a45e1ee..132ed95 100644 (file)
--- 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 23d4fce..81ba368 100644 (file)
--- 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 1273003..b02ed9f 100644 (file)
--- 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>