Split libhidl into base and transport.

am: 63544eacb6 Change-Id: I97974e9bbe99c93591c0a4e85ff75a43c7e63983
2016-11-18 23:14:31 +00:00 · 2016-11-18 23:14:31 +00:00 · 5ec7f082b2
commit 5ec7f082b2
parent fbedd83ffe 63544eacb6
26 changed files with 85 additions and 43 deletions
--- a/benchmarks/msgq/1.0/Android.bp
+++ b/benchmarks/msgq/1.0/Android.bp
@ -34,13 +34,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/bluetooth/1.0/Android.bp
+++ b/bluetooth/1.0/Android.bp
@ -46,13 +46,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@ -38,13 +38,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.boot@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.boot@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/boot/1.0/default/Android.mk
+++ b/boot/1.0/default/Android.mk
@ -8,7 +8,8 @@ LOCAL_SRC_FILES := \

 LOCAL_SHARED_LIBRARIES := \
    liblog \
-    libhidl \
+    libhidlbase \
+    libhidltransport \
    libhwbinder \
    libhardware \
    libutils \
@ -27,7 +28,8 @@ LOCAL_SHARED_LIBRARIES := \
    liblog \
    libhwbinder \
    libhardware \
-    libhidl \
+    libhidlbase \
+    libhidltransport \
    libutils \
    android.hardware.boot@1.0 \

--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@ -46,13 +46,15 @@ cc_library_shared {
    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",
    ],
--- a/nfc/1.0/default/Android.bp
+++ b/nfc/1.0/default/Android.bp
@ -10,7 +10,8 @@ cc_library_shared {
        "libbase",
        "libcutils",
        "libutils",
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "android.hardware.nfc@1.0",
    ],
 }
--- a/nfc/1.0/default/Android.mk
+++ b/nfc/1.0/default/Android.mk
@ -18,7 +18,8 @@ LOCAL_SHARED_LIBRARIES := \

 LOCAL_SHARED_LIBRARIES += \
 	libhwbinder \
-	libhidl \
+	libhidlbase \
+	libhidltransport \
 	android.hardware.nfc@1.0 \

 include $(BUILD_EXECUTABLE)
--- a/radio/1.0/Android.bp
+++ b/radio/1.0/Android.bp
@ -70,13 +70,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.radio@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.radio@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@ -42,14 +42,16 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
        "android.hardware.tests.foo@1.0",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "android.hardware.tests.foo@1.0",
--- a/tests/bar/1.0/default/Android.bp
+++ b/tests/bar/1.0/default/Android.bp
@ -11,7 +11,8 @@ cc_library_shared {
    shared_libs: [
        "libbase",
        "libcutils",
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "liblog",
        "libutils",
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@ -54,13 +54,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@ -42,13 +42,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@ -70,13 +70,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/foo/1.0/default/Android.bp
+++ b/tests/foo/1.0/default/Android.bp
@ -11,7 +11,8 @@ cc_library_shared {
    shared_libs: [
        "libbase",
        "libcutils",
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libfootest",
        "libhwbinder",
        "liblog",
--- a/tests/foo/1.0/default/lib/Android.bp
+++ b/tests/foo/1.0/default/lib/Android.bp
@ -5,7 +5,8 @@ cc_library_shared {
    ],

    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "android.hardware.tests.foo@1.0",
    ],
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@ -58,13 +58,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/inheritance/1.0/default/Android.bp
+++ b/tests/inheritance/1.0/default/Android.bp
@ -11,7 +11,8 @@ cc_library_shared {

    shared_libs: [
        "libbase",
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "liblog",
        "libutils",
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@ -34,13 +34,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/libhwbinder/1.0/default/Android.bp
+++ b/tests/libhwbinder/1.0/default/Android.bp
@ -7,10 +7,11 @@ cc_library_shared {

    shared_libs: [
        "libbase",
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "liblog",
        "libutils",
        "android.hardware.tests.libhwbinder@1.0",
    ],
-}
+}
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@ -34,13 +34,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@ -42,13 +42,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/tests/pointer/1.0/default/Android.bp
+++ b/tests/pointer/1.0/default/Android.bp
@ -10,7 +10,8 @@ cc_library_shared {

    shared_libs: [
        "libbase",
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libpointertest",
        "libhwbinder",
        "liblog",
--- a/tests/pointer/1.0/default/lib/Android.bp
+++ b/tests/pointer/1.0/default/lib/Android.bp
@ -6,7 +6,8 @@ cc_library_shared {

    shared_libs: [
        "libbase",
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "liblog",
        "android.hardware.tests.pointer@1.0",
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@ -134,13 +134,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.wifi@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.wifi@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],
--- a/wifi/1.0/default/Android.mk
+++ b/wifi/1.0/default/Android.mk
@ -32,7 +32,8 @@ LOCAL_SHARED_LIBRARIES := \
    android.hardware.wifi@1.0 \
    libbase \
    libcutils \
-    libhidl \
+    libhidlbase \
+    libhidltransport \
    libhwbinder \
    liblog \
    libnl \
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@ -126,13 +126,15 @@ cc_library_shared {
    generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"],
    shared_libs: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
    export_shared_lib_headers: [
-        "libhidl",
+        "libhidlbase",
+        "libhidltransport",
        "libhwbinder",
        "libutils",
    ],