Merge "Remove libhwbinder/libhidltransport deps" am: 6cffe44e0f am: b7d2632c22

am: 2dc8ae5642

Change-Id: I7be03dd52255dffbdc04357144b2582d27f5079e

camera/cameraserver/Android.bp

@@ -25,7 +25,6 @@ cc_binary {
         "libgui",
         "libbinder",
         "libhidlbase",
-        "libhidltransport",
         "android.hardware.camera.common@1.0",
         "android.hardware.camera.provider@2.4",
         "android.hardware.camera.provider@2.5",

camera/ndk/Android.bp

@@ -107,7 +107,6 @@ cc_library_shared {
     ],
 
     shared_libs: [
-        "libhwbinder",
         "libfmq",
         "libhidlbase",
         "libhardware",
@@ -143,7 +142,6 @@ cc_test {
     vendor: true,
     srcs: ["ndk_vendor/tests/AImageReaderVendorTest.cpp"],
     shared_libs: [
-        "libhwbinder",
         "libcamera2ndk_vendor",
         "libcamera_metadata",
         "libmediandk",

drm/libmediadrm/Android.bp

@@ -34,7 +34,6 @@ cc_library {
         "android.hardware.drm@1.2",
         "libhidlallocatorutils",
         "libhidlbase",
-        "libhidltransport",
     ],
 
     cflags: [

drm/mediadrm/plugins/clearkey/hidl/Android.bp

@@ -48,7 +48,6 @@ cc_defaults {
         "libcrypto",
         "libhidlbase",
         "libhidlmemory",
-        "libhidltransport",
         "liblog",
         "libprotobuf-cpp-lite",
         "libutils",

media/audioserver/Android.mk

@@ -13,8 +13,6 @@ LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	liblog \
 	libhidlbase \
-	libhidltransport \
-	libhwbinder \
 	libmedia \
 	libmedialogservice \
 	libmediautils \

media/bufferpool/1.0/Android.bp

@@ -16,8 +16,6 @@ cc_library {
         "libcutils",
         "libfmq",
         "libhidlbase",
-        "libhwbinder",
-        "libhidltransport",
         "liblog",
         "libutils",
         "android.hardware.media.bufferpool@1.0",

media/bufferpool/2.0/Android.bp

@@ -20,8 +20,6 @@ cc_library {
         "libcutils",
         "libfmq",
         "libhidlbase",
-        "libhwbinder",
-        "libhidltransport",
         "liblog",
         "libutils",
         "android.hardware.media.bufferpool@2.0",

media/codec2/hidl/1.0/utils/Android.bp

@@ -80,8 +80,6 @@ cc_library {
         "libcodec2_vndk",
         "libcutils",
         "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
         "liblog",
         "libstagefright_bufferpool@2.0",
         "libstagefright_bufferqueue_helper",

media/codec2/hidl/client/Android.bp

@@ -17,7 +17,6 @@ cc_library {
         "libcutils",
         "libgui",
         "libhidlbase",
-        "libhidltransport",
         "liblog",
         "libstagefright_bufferpool@2.0",
         "libui",

media/codec2/hidl/services/Android.bp

@@ -17,8 +17,6 @@ cc_binary {
         "libcodec2_hidl@1.0",
         "libcodec2_vndk",
         "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
         "liblog",
         "libstagefright_omx",
         "libstagefright_xmlparser",

media/libaudiohal/impl/Android.bp

@@ -36,8 +36,6 @@ cc_defaults {
         "libhardware",
         "libhidlbase",
         "libhidlmemory",
-        "libhidltransport",
-        "libhwbinder",
         "liblog",
         "libmedia_helper",
         "libmediautils",

media/libmedia/Android.bp

@@ -93,7 +93,6 @@ cc_library_shared {
         "libbinder",
         "libcutils",
         "libhidlbase",
-        "libhidltransport",
         "liblog",
         "libstagefright_foundation",
         "libui",
@@ -154,7 +153,6 @@ cc_library_shared {
         "libcutils",
         "libgui",
         "libhidlbase",
-        "libhidltransport",
         "liblog",
         "libmedia_omx",
         "libstagefright_foundation",

media/libstagefright/bqhelper/Android.bp

@@ -27,7 +27,6 @@ cc_library_shared {
         "libcutils",
         "libhidlbase",
         "libhidlmemory",
-        "libhidltransport",
         "liblog",
         "libstagefright_foundation",
         "libui",
@@ -39,7 +38,6 @@ cc_library_shared {
         "android.hidl.token@1.0-utils",
         "libbase",
         "libEGL",
-        "libhwbinder",
         "libnativewindow",
         "libvndksupport",
     ],

media/libstagefright/omx/Android.bp

@@ -45,7 +45,6 @@ cc_library_shared {
         "libdl",
         "libhidlbase",
         "libhidlmemory",
-        "libhidltransport",
         "libvndksupport",
         "android.hardware.media.omx@1.0",
         "android.hardware.graphics.bufferqueue@1.0",

services/camera/libcameraservice/Android.bp

@@ -86,9 +86,7 @@ cc_library_shared {
         "libfmq",
         "libgui",
         "libhardware",
-        "libhwbinder",
         "libhidlbase",
-        "libhidltransport",
         "libjpeg",
         "libmedia_omx",
         "libmemunreachable",

services/camera/libcameraservice/tests/Android.mk

@@ -23,7 +23,6 @@ LOCAL_SHARED_LIBRARIES := \
     libcameraservice \
     libhidlbase \
     liblog \
-    libhidltransport \
     libcamera_client \
     libcamera_metadata \
     libutils \

services/mediacodec/Android.bp

@@ -10,8 +10,6 @@ cc_binary {
         "libavservices_minijail",
         "libbase",
         "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
         "liblog",
         "libmedia_codecserviceregistrant",
     ],

services/mediacodec/Android.mk

@@ -39,9 +39,7 @@ LOCAL_SHARED_LIBRARIES := \
     libbase \
     libavservices_minijail_vendor \
     libcutils \
-    libhwbinder \
     libhidlbase \
-    libhidltransport \
     libstagefright_omx \
     libstagefright_xmlparser \
     android.hardware.media.omx@1.0 \

services/mediadrm/Android.mk

@@ -27,7 +27,6 @@ LOCAL_SHARED_LIBRARIES:= \
     libutils \
     libhidlbase \
     libhidlmemory \
-    libhidltransport \
     android.hardware.drm@1.0 \
     android.hardware.drm@1.1 \
     android.hardware.drm@1.2

services/soundtrigger/Android.bp

@@ -31,10 +31,8 @@ cc_library_shared {
         "libaudioutils",
         "libmediautils",
 
-        "libhwbinder",
         "libhidlbase",
         "libhidlmemory",
-        "libhidltransport",
         "libbase",
         "libaudiohal",
         "libaudiohal_deathhandler",