Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a am: 8c22c3862f am: 6684ee8c36

am: 9a5ffa3196 Change-Id: I3a80895d10767fe68e90a907312a83ded976cbcc
2026-02-01 11:36:00 +00:00 · 2019-09-06 16:06:13 -07:00
parent decd6eb7ce 9a5ffa3196
commit 38c46d0b98
96 changed files with 0 additions and 154 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -38,8 +38,6 @@ cc_defaults {
        "libcutils",
        "liblog",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "libutils",
    ],
    cflags: [
--- a/atrace/1.0/default/Android.bp
+++ b/atrace/1.0/default/Android.bp
@@ -29,7 +29,6 @@ cc_binary {
        "libbase",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.atrace@1.0",
    ],
 }
--- a/audio/common/all-versions/default/service/Android.mk
+++ b/audio/common/all-versions/default/service/Android.mk
@@ -34,11 +34,9 @@ LOCAL_SHARED_LIBRARIES := \
    libcutils \
    libbinder \
    libhidlbase \
-    libhidltransport \
    liblog \
    libutils \
    libhardware \
-    libhwbinder \
    android.hardware.audio@2.0 \
    android.hardware.audio@4.0 \
    android.hardware.audio@5.0 \
--- a/audio/core/all-versions/default/Android.bp
+++ b/audio/core/all-versions/default/Android.bp
@@ -25,7 +25,6 @@ cc_defaults {
        "libfmq",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libmedia_helper",
        "libutils",
--- a/audio/effect/all-versions/default/Android.bp
+++ b/audio/effect/all-versions/default/Android.bp
@@ -28,7 +28,6 @@ cc_defaults {
        "libfmq",
        "libhidlbase",
        "libhidlmemory",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.audio.common-util",
--- a/authsecret/1.0/default/Android.bp
+++ b/authsecret/1.0/default/Android.bp
@@ -13,7 +13,6 @@ cc_binary {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.authsecret@1.0",
--- a/automotive/audiocontrol/1.0/default/Android.bp
+++ b/automotive/audiocontrol/1.0/default/Android.bp
@@ -26,7 +26,6 @@ cc_binary {
    shared_libs: [
        "android.hardware.automotive.audiocontrol@1.0",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
--- a/automotive/evs/1.0/default/Android.bp
+++ b/automotive/evs/1.0/default/Android.bp
@@ -18,7 +18,6 @@ cc_binary {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libui",
        "libutils",
--- a/automotive/vehicle/2.0/default/Android.bp
+++ b/automotive/vehicle/2.0/default/Android.bp
@@ -16,7 +16,6 @@ cc_defaults {
    name: "vhal_v2_0_defaults",
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.automotive.vehicle@2.0",
--- a/biometrics/fingerprint/2.1/default/Android.bp
+++ b/biometrics/fingerprint/2.1/default/Android.bp
@@ -13,7 +13,6 @@ cc_binary {
        "libcutils",
        "liblog",
        "libhidlbase",
-        "libhidltransport",
        "libhardware",
        "libutils",
        "android.hardware.biometrics.fingerprint@2.1",
--- a/bluetooth/1.0/default/Android.bp
+++ b/bluetooth/1.0/default/Android.bp
@@ -29,7 +29,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
@@ -130,7 +129,6 @@ cc_binary {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.bluetooth@1.0",
    ],
 }
--- a/bluetooth/a2dp/1.0/default/Android.bp
+++ b/bluetooth/a2dp/1.0/default/Android.bp
@@ -7,7 +7,6 @@ cc_library_shared {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.bluetooth.a2dp@1.0",
    ],
--- a/bluetooth/audio/2.0/default/Android.bp
+++ b/bluetooth/audio/2.0/default/Android.bp
@@ -19,7 +19,6 @@ cc_library_shared {
        "libcutils",
        "libfmq",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
@@ -41,7 +40,6 @@ cc_library_shared {
        "libcutils",
        "libfmq",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
--- a/boot/1.0/default/Android.bp
+++ b/boot/1.0/default/Android.bp
@@ -9,7 +9,6 @@ cc_library_shared {
    shared_libs: [
        "liblog",
        "libhidlbase",
-        "libhidltransport",
        "libhardware",
        "libutils",
        "android.hardware.boot@1.0",
@@ -29,7 +28,6 @@ cc_binary {
        "liblog",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.boot@1.0",
    ],
--- a/broadcastradio/1.0/default/Android.bp
+++ b/broadcastradio/1.0/default/Android.bp
@@ -31,7 +31,6 @@ cc_library_shared {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "liblog",
        "libhardware",
--- a/broadcastradio/1.1/default/Android.bp
+++ b/broadcastradio/1.1/default/Android.bp
@@ -41,7 +41,6 @@ cc_binary {
        "android.hardware.broadcastradio@1.1",
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
--- a/broadcastradio/2.0/default/Android.bp
+++ b/broadcastradio/2.0/default/Android.bp
@@ -42,7 +42,6 @@ cc_binary {
        "android.hardware.broadcastradio@2.0",
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
    ],
 }
--- a/camera/device/1.0/default/Android.bp
+++ b/camera/device/1.0/default/Android.bp
@@ -8,8 +8,6 @@ cc_library_shared {
    shared_libs: [
        "libhidlbase",
        "libhidlmemory",
-        "libhidltransport",
-        "libhwbinder",
        "libutils",
        "android.hardware.camera.device@1.0",
        "android.hardware.camera.common@1.0",
--- a/camera/device/3.2/default/Android.bp
+++ b/camera/device/3.2/default/Android.bp
@@ -7,7 +7,6 @@ cc_library_shared {
           "convert.cpp"],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "libcutils",
        "android.hardware.camera.device@3.2",
--- a/camera/device/3.3/default/Android.bp
+++ b/camera/device/3.3/default/Android.bp
@@ -7,7 +7,6 @@ cc_library_shared {
           "convert.cpp"],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "libcutils",
        "camera.device@3.2-impl",
--- a/camera/device/3.4/default/Android.bp
+++ b/camera/device/3.4/default/Android.bp
@@ -38,7 +38,6 @@ cc_library_shared {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "libcutils",
        "camera.device@3.2-impl",
@@ -76,7 +75,6 @@ cc_library_shared {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "libcutils",
        "camera.device@3.2-impl",
--- a/camera/device/3.5/default/Android.bp
+++ b/camera/device/3.5/default/Android.bp
@@ -37,7 +37,6 @@ cc_library_shared {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "libcutils",
        "camera.device@3.2-impl",
@@ -72,7 +71,6 @@ cc_library_shared {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "libcutils",
        "camera.device@3.2-impl",
--- a/camera/provider/2.4/default/Android.bp
+++ b/camera/provider/2.4/default/Android.bp
@@ -25,7 +25,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
@@ -65,7 +64,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libtinyxml2",
        "libutils",
@@ -112,7 +110,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libtinyxml2",
        "libutils",
@@ -152,7 +149,6 @@ cc_defaults {
        "libcamera_metadata",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
@@ -217,7 +213,6 @@ cc_binary {
        "android.hardware.camera.provider@2.4",
        "libbinder",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libtinyxml2",
        "libutils",
--- a/camera/provider/2.5/default/Android.bp
+++ b/camera/provider/2.5/default/Android.bp
@@ -24,7 +24,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
@@ -64,7 +63,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libtinyxml2",
        "libutils",
@@ -103,7 +101,6 @@ cc_defaults {
        "libcamera_metadata",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
@@ -170,7 +167,6 @@ cc_binary {
        "android.hardware.graphics.mapper@2.0",
        "libbinder",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libtinyxml2",
        "libutils",
--- a/cas/1.0/default/Android.bp
+++ b/cas/1.0/default/Android.bp
@@ -21,7 +21,6 @@ cc_defaults {
      "libbinder",
      "libhidlbase",
      "libhidlmemory",
-      "libhidltransport",
      "liblog",
      "libstagefright_foundation",
      "libutils",
--- a/cas/1.1/default/Android.bp
+++ b/cas/1.1/default/Android.bp
@@ -22,7 +22,6 @@ cc_defaults {
      "libbinder",
      "libhidlbase",
      "libhidlmemory",
-      "libhidltransport",
      "liblog",
      "libutils",
    ],
--- a/configstore/1.1/default/Android.mk
+++ b/configstore/1.1/default/Android.mk
@@ -17,7 +17,6 @@ include $(LOCAL_PATH)/surfaceflinger.mk

 LOCAL_SHARED_LIBRARIES := \
    libhidlbase \
-    libhidltransport \
    libbase \
    libhwminijail \
    liblog \
--- a/confirmationui/1.0/default/Android.bp
+++ b/confirmationui/1.0/default/Android.bp
@@ -36,7 +36,6 @@ cc_binary {
        "libcrypto",
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
--- a/contexthub/1.0/default/Android.bp
+++ b/contexthub/1.0/default/Android.bp
@@ -28,7 +28,6 @@ cc_library_shared {
        "libcutils",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.contexthub@1.0",
    ],
 }
@@ -47,7 +46,6 @@ cc_binary {
        "libdl",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.contexthub@1.0",
--- a/drm/1.0/default/Android.mk
+++ b/drm/1.0/default/Android.mk
@@ -59,7 +59,6 @@ LOCAL_SHARED_LIBRARIES := \
    libcutils \
    libhidlbase \
    libhidlmemory \
-    libhidltransport \
    liblog \
    libstagefright_foundation \
    libutils \
--- a/drm/1.0/default/common_default_service.mk
+++ b/drm/1.0/default/common_default_service.mk
@@ -21,7 +21,6 @@ LOCAL_SHARED_LIBRARIES := \
  android.hardware.drm@1.0 \
  android.hidl.memory@1.0 \
  libhidlbase \
-  libhidltransport \
  libhardware \
  liblog \
  libutils \
--- a/dumpstate/1.0/default/Android.bp
+++ b/dumpstate/1.0/default/Android.bp
@@ -18,7 +18,6 @@ cc_binary {
        "libcutils",
        "libdumpstateutil",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
--- a/fastboot/1.0/default/Android.bp
+++ b/fastboot/1.0/default/Android.bp
@@ -23,7 +23,6 @@ cc_library {
    shared_libs: [
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "libcutils",
        "android.hardware.fastboot@1.0",
--- a/gatekeeper/1.0/default/Android.bp
+++ b/gatekeeper/1.0/default/Android.bp
@@ -10,7 +10,6 @@ cc_library_shared {
        "android.hardware.gatekeeper@1.0",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "liblog",
    ],
@@ -30,7 +29,6 @@ cc_binary {
        "android.hardware.gatekeeper@1.0",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "liblog",
    ],
--- a/gatekeeper/1.0/software/Android.bp
+++ b/gatekeeper/1.0/software/Android.bp
@@ -15,7 +15,6 @@ cc_binary {
        "libbase",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "liblog",
        "libcrypto",
--- a/gnss/1.0/default/Android.bp
+++ b/gnss/1.0/default/Android.bp
@@ -22,7 +22,6 @@ cc_library_shared {
    shared_libs: [
        "liblog",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.gnss@1.0",
        "libhardware",
@@ -47,7 +46,6 @@ cc_binary {
        "libhardware",
        "libbinder",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.gnss@1.0",
    ],

--- a/gnss/1.1/default/Android.bp
+++ b/gnss/1.1/default/Android.bp
@@ -12,7 +12,6 @@ cc_binary {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "liblog",
        "android.hardware.gnss@1.1",
--- a/gnss/2.0/default/Android.bp
+++ b/gnss/2.0/default/Android.bp
@@ -33,7 +33,6 @@ cc_binary {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "liblog",
        "android.hardware.gnss@2.0",
--- a/graphics/allocator/2.0/default/Android.bp
+++ b/graphics/allocator/2.0/default/Android.bp
@@ -13,7 +13,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
@@ -31,7 +30,6 @@ cc_binary {
    shared_libs: [
        "android.hardware.graphics.allocator@2.0",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
--- a/graphics/composer/2.1/default/Android.bp
+++ b/graphics/composer/2.1/default/Android.bp
@@ -15,7 +15,6 @@ cc_library_shared {
        "libfmq",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libsync",
        "libutils",
@@ -38,7 +37,6 @@ cc_binary {
        "android.hardware.graphics.composer@2.1",
        "libbinder",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libsync",
        "libutils",
--- a/graphics/composer/2.2/default/Android.mk
+++ b/graphics/composer/2.2/default/Android.mk
@@ -19,7 +19,6 @@ LOCAL_SHARED_LIBRARIES := \
        libfmq \
        libhardware \
        libhidlbase \
-        libhidltransport \
        libhwc2on1adapter \
        libhwc2onfbadapter \
        liblog \
--- a/graphics/composer/2.3/default/Android.bp
+++ b/graphics/composer/2.3/default/Android.bp
@@ -36,7 +36,6 @@ cc_binary {
        "libfmq",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libhwc2on1adapter",
        "libhwc2onfbadapter",
        "liblog",
--- a/graphics/composer/2.3/vts/functional/Android.bp
+++ b/graphics/composer/2.3/vts/functional/Android.bp
@@ -23,7 +23,6 @@ cc_test {
    shared_libs: [
        "libfmq",
        "libhidlbase",
-        "libhidltransport",
        "libsync",
    ],
    static_libs: [
--- a/graphics/mapper/2.0/default/Android.bp
+++ b/graphics/mapper/2.0/default/Android.bp
@@ -28,7 +28,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libsync",
        "libutils",
--- a/graphics/mapper/2.1/default/Android.bp
+++ b/graphics/mapper/2.1/default/Android.bp
@@ -29,7 +29,6 @@ cc_library_shared {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libsync",
        "libutils",
--- a/health/1.0/default/Android.bp
+++ b/health/1.0/default/Android.bp
@@ -12,7 +12,6 @@ cc_library_static {
    shared_libs: [
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.health@1.0",
    ],
--- a/health/1.0/default/Android.mk
+++ b/health/1.0/default/Android.mk
@@ -13,7 +13,6 @@ LOCAL_HEADER_LIBRARIES := libhealthd_headers
 LOCAL_SHARED_LIBRARIES := \
    libcutils \
    libhidlbase \
-    libhidltransport \
    liblog \
    libutils \
    android.hardware.health@1.0 \
@@ -39,7 +38,6 @@ LOCAL_SHARED_LIBRARIES := \
    libbase \
    libutils \
    libhidlbase \
-    libhidltransport \
    android.hardware.health@1.0 \

 include $(BUILD_EXECUTABLE)
--- a/health/2.0/README.md
+++ b/health/2.0/README.md
@@ -44,7 +44,6 @@
            "libbase",
            "libcutils",
            "libhidlbase",
-            "libhidltransport",
            "libutils",
            "android.hardware.health@2.0",
        ],
--- a/health/2.0/default/Android.bp
+++ b/health/2.0/default/Android.bp
@@ -10,8 +10,6 @@ cc_defaults {
    shared_libs: [
        "libbase",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
        "libcutils",
--- a/health/storage/1.0/default/Android.bp
+++ b/health/storage/1.0/default/Android.bp
@@ -33,7 +33,6 @@ cc_binary {
    shared_libs: [
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.health.storage@1.0",
    ],
--- a/health/storage/1.0/vts/functional/Android.bp
+++ b/health/storage/1.0/vts/functional/Android.bp
@@ -21,7 +21,6 @@ cc_test {
    static_libs: ["android.hardware.health.storage@1.0"],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
    ],
    test_suites: ["general-tests"],
 }
--- a/input/classifier/1.0/default/Android.bp
+++ b/input/classifier/1.0/default/Android.bp
@@ -11,7 +11,6 @@ cc_binary {
    shared_libs: [
        "android.hardware.input.classifier@1.0",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
    ],
--- a/ir/1.0/default/Android.bp
+++ b/ir/1.0/default/Android.bp
@@ -20,7 +20,6 @@ cc_library_shared {
    srcs: ["ConsumerIr.cpp"],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libhardware",
        "liblog",
        "libutils",
@@ -40,7 +39,6 @@ cc_binary {
        "liblog",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.ir@1.0",
    ],
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -15,7 +15,6 @@ LOCAL_SHARED_LIBRARIES := \
    libpuresoftkeymasterdevice \
    libkeymaster3device \
    libhidlbase \
-    libhidltransport \
    libutils \
    libhardware \
    android.hardware.keymaster@3.0
@@ -38,7 +37,6 @@ LOCAL_SHARED_LIBRARIES := \
    libutils \
    libhardware \
    libhidlbase \
-    libhidltransport \
    android.hardware.keymaster@3.0

 include $(BUILD_EXECUTABLE)
--- a/keymaster/4.0/default/Android.bp
+++ b/keymaster/4.0/default/Android.bp
@@ -28,7 +28,6 @@ cc_binary {
        "libcutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libkeymaster4",
        "liblog",
        "libutils",
--- a/keymaster/4.0/support/Android.bp
+++ b/keymaster/4.0/support/Android.bp
@@ -39,7 +39,6 @@ cc_library {
        "libcrypto",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
    ]
 }
--- a/light/2.0/default/Android.bp
+++ b/light/2.0/default/Android.bp
@@ -23,7 +23,6 @@ cc_library_shared {
        "libbase",
        "liblog",
        "libhidlbase",
-        "libhidltransport",
        "libhardware",
        "libutils",
        "android.hardware.light@2.0",
@@ -44,7 +43,6 @@ cc_defaults {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.light@2.0",
    ],
 }
--- a/light/utils/Android.bp
+++ b/light/utils/Android.bp
@@ -24,7 +24,6 @@ cc_binary {
        "android.hardware.light@2.0",
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
    ],
 }
--- a/memtrack/1.0/default/Android.bp
+++ b/memtrack/1.0/default/Android.bp
@@ -23,7 +23,6 @@ cc_library_shared {
        "libbase",
        "liblog",
        "libhidlbase",
-        "libhidltransport",
        "libhardware",
        "libutils",
        "android.hardware.memtrack@1.0",
@@ -46,7 +45,6 @@ cc_binary {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.memtrack@1.0",
    ],

--- a/nfc/1.0/default/Android.bp
+++ b/nfc/1.0/default/Android.bp
@@ -12,7 +12,6 @@ cc_library_shared {
        "libcutils",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.nfc@1.0",
    ],
 }
@@ -33,7 +32,6 @@ cc_binary {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.nfc@1.0",
    ],

--- a/power/1.0/default/Android.bp
+++ b/power/1.0/default/Android.bp
@@ -28,7 +28,6 @@ cc_library_shared {
        "liblog",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.power@1.0",
    ],
@@ -54,7 +53,6 @@ cc_binary {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.power@1.0",
    ],

--- a/power/stats/1.0/default/Android.bp
+++ b/power/stats/1.0/default/Android.bp
@@ -25,7 +25,6 @@ cc_binary {
        "libcutils",
        "libfmq",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.power.stats@1.0",
--- a/power/stats/1.0/vts/functional/Android.bp
+++ b/power/stats/1.0/vts/functional/Android.bp
@@ -31,8 +31,6 @@ cc_test {
        "liblog",
        "libhidlbase",
        "libfmq",
-        "libhidltransport",
-        "libhwbinder",
        "libutils",
    ],
 }
--- a/radio/1.2/default/Android.bp
+++ b/radio/1.2/default/Android.bp
@@ -9,7 +9,6 @@ cc_binary {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.radio@1.2",
@@ -29,7 +28,6 @@ cc_binary {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.radio@1.2",
--- a/radio/config/1.0/default/Android.bp
+++ b/radio/config/1.0/default/Android.bp
@@ -11,7 +11,6 @@ cc_binary {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.radio.config@1.0",
--- a/renderscript/1.0/default/Android.bp
+++ b/renderscript/1.0/default/Android.bp
@@ -14,7 +14,6 @@ cc_library_shared {
        "libdl",
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.renderscript@1.0",
    ],
--- a/sensors/1.0/default/Android.bp
+++ b/sensors/1.0/default/Android.bp
@@ -11,7 +11,6 @@ cc_library_shared {
        "libbase",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.sensors@1.0",
    ],
    static_libs: [
@@ -34,7 +33,6 @@ cc_library_static {
        "libbase",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.sensors@1.0",
    ],
    local_include_dirs: ["include/sensors"],
@@ -57,7 +55,6 @@ cc_binary {
        "libbase",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.sensors@1.0",
    ],
 }
--- a/sensors/2.0/default/Android.bp
+++ b/sensors/2.0/default/Android.bp
@@ -30,7 +30,6 @@ cc_binary {
        "libcutils",
        "libfmq",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libpower",
        "libutils",
--- a/soundtrigger/2.0/default/Android.bp
+++ b/soundtrigger/2.0/default/Android.bp
@@ -28,7 +28,6 @@ cc_library_shared {

    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "libhardware",
--- a/soundtrigger/2.1/default/Android.mk
+++ b/soundtrigger/2.1/default/Android.mk
@@ -29,7 +29,6 @@ LOCAL_SHARED_LIBRARIES := \
        libhardware \
        libhidlbase \
        libhidlmemory \
-        libhidltransport \
        liblog \
        libutils \
        android.hardware.soundtrigger@2.1 \
--- a/soundtrigger/2.2/default/Android.bp
+++ b/soundtrigger/2.2/default/Android.bp
@@ -22,7 +22,6 @@ cc_library_shared {
    ],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libhidlmemory",
        "libutils",
--- a/tests/bar/1.0/default/Android.bp
+++ b/tests/bar/1.0/default/Android.bp
@@ -13,8 +13,6 @@ cc_library {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/baz/1.0/default/Android.bp
+++ b/tests/baz/1.0/default/Android.bp
@@ -9,8 +9,6 @@ cc_library {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/extension/light/2.0/default/Android.bp
+++ b/tests/extension/light/2.0/default/Android.bp
@@ -27,7 +27,6 @@ cc_binary {

    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.light@2.0",
        "android.hardware.tests.extension.light@2.0",
--- a/tests/foo/1.0/default/Android.bp
+++ b/tests/foo/1.0/default/Android.bp
@@ -13,8 +13,6 @@ cc_library {
        "libcutils",
        "libfootest",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/foo/1.0/default/lib/Android.bp
+++ b/tests/foo/1.0/default/lib/Android.bp
@@ -8,8 +8,6 @@ cc_library {
    shared_libs: [
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
    ],
    static_libs: ["android.hardware.tests.foo@1.0"],
--- a/tests/hash/1.0/default/Android.bp
+++ b/tests/hash/1.0/default/Android.bp
@@ -8,8 +8,6 @@ cc_library {
    shared_libs: [
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/inheritance/1.0/default/Android.bp
+++ b/tests/inheritance/1.0/default/Android.bp
@@ -14,8 +14,6 @@ cc_library {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/libhwbinder/1.0/default/Android.bp
+++ b/tests/libhwbinder/1.0/default/Android.bp
@@ -9,8 +9,6 @@ cc_library {
    shared_libs: [
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/memory/1.0/default/Android.bp
+++ b/tests/memory/1.0/default/Android.bp
@@ -22,9 +22,7 @@ cc_library {
    shared_libs: [
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
        "libhidlmemory",
-        "libhwbinder",
        "liblog",
        "libutils",
        "android.hidl.memory@1.0",
--- a/tests/msgq/1.0/default/Android.bp
+++ b/tests/msgq/1.0/default/Android.bp
@@ -26,8 +26,6 @@ cc_library {
        "libcutils",
        "libfmq",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
@@ -49,7 +47,6 @@ cc_test {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.tests.msgq@1.0"
@@ -68,8 +65,6 @@ cc_test {
        "libcutils",
        "libfmq",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/multithread/1.0/default/Android.bp
+++ b/tests/multithread/1.0/default/Android.bp
@@ -9,8 +9,6 @@ cc_library {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/safeunion/1.0/default/Android.bp
+++ b/tests/safeunion/1.0/default/Android.bp
@@ -9,8 +9,6 @@ cc_library {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/safeunion/cpp/1.0/default/Android.bp
+++ b/tests/safeunion/cpp/1.0/default/Android.bp
@@ -8,8 +8,6 @@ cc_library {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/tests/trie/1.0/default/Android.bp
+++ b/tests/trie/1.0/default/Android.bp
@@ -9,8 +9,6 @@ cc_library {
        "libbase",
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
        "liblog",
        "libutils",
    ],
--- a/thermal/1.0/default/Android.bp
+++ b/thermal/1.0/default/Android.bp
@@ -27,7 +27,6 @@ cc_library_shared {
        "libcutils",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.thermal@1.0",
    ],
 }
@@ -48,7 +47,6 @@ cc_binary {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.thermal@1.0",
    ],
 }
--- a/thermal/2.0/default/Android.bp
+++ b/thermal/2.0/default/Android.bp
@@ -27,7 +27,6 @@ cc_binary {
    shared_libs: [
        "libbase",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.thermal@2.0",
        "android.hardware.thermal@1.0",
--- a/tv/cec/1.0/default/Android.bp
+++ b/tv/cec/1.0/default/Android.bp
@@ -7,7 +7,6 @@ cc_library_shared {

    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libbase",
        "libutils",
@@ -34,7 +33,6 @@ cc_binary {
        "libhardware_legacy",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.tv.cec@1.0",
    ],

@@ -58,7 +56,6 @@ cc_binary {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.tv.cec@1.0",
    ],
 }
--- a/tv/cec/2.0/default/Android.bp
+++ b/tv/cec/2.0/default/Android.bp
@@ -7,7 +7,6 @@ cc_library_shared {

    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libbase",
        "libutils",
@@ -35,7 +34,6 @@ cc_binary {
        "libhardware_legacy",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.tv.cec@2.0",
    ],

--- a/tv/input/1.0/default/Android.bp
+++ b/tv/input/1.0/default/Android.bp
@@ -10,7 +10,6 @@ cc_library_shared {
        "liblog",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "libutils",
        "android.hardware.audio.common@2.0",
        "android.hardware.tv.input@1.0",
@@ -35,7 +34,6 @@ cc_binary {
        "libhardware_legacy",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.audio.common@2.0",
        "android.hardware.tv.input@1.0",
    ],
--- a/tv/tuner/1.0/default/Android.bp
+++ b/tv/tuner/1.0/default/Android.bp
@@ -20,7 +20,6 @@ cc_defaults {
        "libfmq",
        "libhidlbase",
        "libhidlmemory",
-        "libhidltransport",
        "liblog",
        "libstagefright_foundation",
        "libutils",
--- a/usb/1.0/default/Android.bp
+++ b/usb/1.0/default/Android.bp
@@ -26,7 +26,6 @@ cc_binary {
    shared_libs: [
        "libcutils",
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "libhardware",
--- a/vibrator/1.0/default/Android.bp
+++ b/vibrator/1.0/default/Android.bp
@@ -21,7 +21,6 @@ cc_library_shared {
    srcs: ["Vibrator.cpp"],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "libhardware",
@@ -39,7 +38,6 @@ cc_binary {

    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "libhardware",
--- a/vibrator/1.3/example/Android.bp
+++ b/vibrator/1.3/example/Android.bp
@@ -23,7 +23,6 @@ cc_binary {
    cflags: ["-Wall", "-Werror"],
    shared_libs: [
        "libhidlbase",
-        "libhidltransport",
        "liblog",
        "libutils",
        "android.hardware.vibrator@1.0",
--- a/vr/1.0/default/Android.bp
+++ b/vr/1.0/default/Android.bp
@@ -12,7 +12,6 @@ cc_library_shared {
        "libcutils",
        "libutils",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.vr@1.0",
    ],
 }
@@ -30,7 +29,6 @@ cc_binary {
        "libutils",
        "libhardware",
        "libhidlbase",
-        "libhidltransport",
        "android.hardware.vr@1.0",
    ],
 }
--- a/wifi/1.3/default/Android.mk
+++ b/wifi/1.3/default/Android.mk
@@ -59,7 +59,6 @@ LOCAL_SHARED_LIBRARIES := \
    libbase \
    libcutils \
    libhidlbase \
-    libhidltransport \
    liblog \
    libnl \
    libutils \
@@ -86,7 +85,6 @@ LOCAL_SHARED_LIBRARIES := \
    libbase \
    libcutils \
    libhidlbase \
-    libhidltransport \
    liblog \
    libnl \
    libutils \
@@ -117,7 +115,6 @@ LOCAL_SHARED_LIBRARIES := \
    libbase \
    libcutils \
    libhidlbase \
-    libhidltransport \
    liblog \
    libnl \
    libutils \
@@ -160,7 +157,6 @@ LOCAL_SHARED_LIBRARIES := \
    libbase \
    libcutils \
    libhidlbase \
-    libhidltransport \
    liblog \
    libnl \
    libutils \