Split libhidl into base and transport.
Bug: 32756130
Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp
index b6e8d08..9584636 100644
--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@@ -46,13 +46,15 @@
generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp
index a8c4c81..b484ba6 100644
--- a/nfc/1.0/default/Android.bp
+++ b/nfc/1.0/default/Android.bp
@@ -10,7 +10,8 @@
"libbase",
"libcutils",
"libutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"android.hardware.nfc@1.0",
],
}
diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk
index d4e46f8..a6c7d5c 100644
--- a/nfc/1.0/default/Android.mk
+++ b/nfc/1.0/default/Android.mk
@@ -18,7 +18,8 @@
LOCAL_SHARED_LIBRARIES += \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.nfc@1.0 \
include $(BUILD_EXECUTABLE)
diff --git a/nfc/1.0/vts/Android.mk b/nfc/1.0/vts/Android.mk
index 6f63e03..67adc7f 100644
--- a/nfc/1.0/vts/Android.mk
+++ b/nfc/1.0/vts/Android.mk
@@ -37,7 +37,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -74,7 +75,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -105,7 +107,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp
index 0f1afbd..0f9eb3d 100644
--- a/nfc/1.0/vts/functional/Android.bp
+++ b/nfc/1.0/vts/functional/Android.bp
@@ -22,7 +22,8 @@
"libbase",
"liblog",
"libcutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libnativehelper",
"libutils",
@@ -33,4 +34,4 @@
"-O0",
"-g",
],
-}
\ No newline at end of file
+}