Split libhidl into base and transport.
Bug: 32756130
Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 004d7d2..4cf1e7f 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp
index 8eac8f5..994feb3 100644
--- a/graphics/allocator/2.0/default/Android.bp
+++ b/graphics/allocator/2.0/default/Android.bp
@@ -8,7 +8,8 @@
"libbase",
"libcutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
@@ -23,7 +24,8 @@
shared_libs: [
"android.hardware.graphics.allocator@2.0",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp
index fa95ca0..6c6ebbe 100644
--- a/graphics/common/1.0/Android.bp
+++ b/graphics/common/1.0/Android.bp
@@ -30,13 +30,15 @@
generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp
index fa58dbb..8742e88 100644
--- a/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@ -46,14 +46,16 @@
generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.graphics.allocator@2.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.graphics.allocator@2.0",
diff --git a/graphics/composer/2.1/default/Android.bp b/graphics/composer/2.1/default/Android.bp
index 6936347..22f4906 100644
--- a/graphics/composer/2.1/default/Android.bp
+++ b/graphics/composer/2.1/default/Android.bp
@@ -8,7 +8,8 @@
"libbase",
"libcutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
@@ -29,7 +30,8 @@
"libbinder",
"libcutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
diff --git a/graphics/mapper/2.0/default/Android.bp b/graphics/mapper/2.0/default/Android.bp
index b738ae8..7da6eb1 100644
--- a/graphics/mapper/2.0/default/Android.bp
+++ b/graphics/mapper/2.0/default/Android.bp
@@ -21,7 +21,8 @@
shared_libs: [
"android.hardware.graphics.allocator@2.0",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
],