Split libhidl into base and transport.
Bug: 32756130
Test: mma
Change-Id: I878e0e8f94e01695f633bc80ef163dbe18c8f622
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 087e877..0adfdea 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -67,7 +67,8 @@
"libbinder",
"libcutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libsync",
"libutils",
"liblog",
diff --git a/services/sensorservice/Android.mk b/services/sensorservice/Android.mk
index d6e6187..86af0ef 100644
--- a/services/sensorservice/Android.mk
+++ b/services/sensorservice/Android.mk
@@ -46,7 +46,8 @@
LOCAL_SHARED_LIBRARIES += \
libbase \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
android.hardware.sensors@1.0
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 3800ce8..4369fd2 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -139,7 +139,8 @@
liblog \
libdl \
libhardware \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
libEGL \
@@ -151,16 +152,14 @@
libpowermanager \
libvulkan \
libprotobuf-cpp-lite \
- libhidl \
- libhwbinder \
libbase \
- libutils \
android.hardware.power@1.0
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \
android.hardware.graphics.allocator@2.0 \
android.hardware.graphics.composer@2.1 \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code