Split libhidl into base and transport.
am: a5abe9214a
Change-Id: Ia53b4d3fc715b6d059772c9a4169542c729c111c
diff --git a/c2hal/test/Android.bp b/c2hal/test/Android.bp
index 5b475c0..c993d31 100644
--- a/c2hal/test/Android.bp
+++ b/c2hal/test/Android.bp
@@ -61,7 +61,8 @@
generated_sources: ["c2hal_test_genc++"],
export_generated_headers: ["c2hal_test_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
diff --git a/main.cpp b/main.cpp
index a4f5dc0..d0be9c2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -721,7 +721,8 @@
<< "shared_libs: [\n";
out.indent();
- out << "\"libhidl\",\n"
+ out << "\"libhidlbase\",\n"
+ << "\"libhidltransport\",\n"
<< "\"libhwbinder\",\n"
<< "\"libutils\",\n"
<< "\"libcutils\",\n";
@@ -734,7 +735,8 @@
out << "export_shared_lib_headers: [\n";
out.indent();
- out << "\"libhidl\",\n"
+ out << "\"libhidlbase\",\n"
+ << "\"libhidltransport\",\n"
<< "\"libhwbinder\",\n"
<< "\"libutils\",\n";
for (const auto &importedPackage : importedPackages) {
@@ -810,7 +812,8 @@
out << "\n";
out << "LOCAL_SHARED_LIBRARIES := \\\n";
out.indent();
- out << "libhidl \\\n"
+ out << "libhidlbase \\\n"
+ << "libhidltransport \\\n"
<< "libhwbinder \\\n"
<< "libutils \\\n"
<< makeLibraryName(packageFQName) << " \\\n";
diff --git a/test/Android.bp b/test/Android.bp
index e2d3124..aea10c0 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -11,7 +11,8 @@
"libbase",
"liblog",
"libcutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libfootest",
"libhwbinder",
"libnativehelper",
diff --git a/test/java_test/Android.mk b/test/java_test/Android.mk
index 4641ce0..89e0067 100644
--- a/test/java_test/Android.mk
+++ b/test/java_test/Android.mk
@@ -39,7 +39,8 @@
LOCAL_SHARED_LIBRARIES := \
libbase \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
android.hardware.tests.baz@1.0 \
diff --git a/test/vendor/1.0/Android.bp b/test/vendor/1.0/Android.bp
index e30af12..d72ad8f 100644
--- a/test/vendor/1.0/Android.bp
+++ b/test/vendor/1.0/Android.bp
@@ -34,13 +34,15 @@
generated_headers: ["tests.vendor@1.0_genc++_headers"],
export_generated_headers: ["tests.vendor@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],