Link against libhidl for HidlSupport/svcmgr

am: 5f9e4f86e8 Change-Id: I8955cfde144b8cc985788ed0fcea5403c56b30df
2016-09-07 18:27:24 +00:00
parent 93618c7d20 5f9e4f86e8
commit 46b98caa18
4 changed files with 4 additions and 3 deletions
--- 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 += \
--- 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>
--- 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>

--- 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>