From 0daed48a8840c3e611ce8cf3950dd25a74b1f673 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 6 Sep 2019 12:09:14 -0700
Subject: [PATCH] Remove libhwbinder/libhidltransport deps

Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I136e4d4459bb8c3c5abf3c0758dd5ae14d0ad2a2
---
 cmds/app_process/Android.bp  | 1 -
 cmds/statsd/Android.bp       | 2 --
 media/jni/Android.bp         | 2 --
 services/core/jni/Android.bp | 2 --
 tests/net/Android.bp         | 2 --
 5 files changed, 9 deletions(-)

diff --git a/cmds/app_process/Android.bp b/cmds/app_process/Android.bp
index f92502370566f..8be95e4659b4e 100644
--- a/cmds/app_process/Android.bp
+++ b/cmds/app_process/Android.bp
@@ -22,7 +22,6 @@ cc_binary {
         "libcutils",
         "libdl",
         "libhidlbase",
-        "libhwbinder",
         "liblog",
         "libnativeloader",
         "libutils",
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 6df0a8e14f6ac..be268aa214ad0 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -132,8 +132,6 @@ cc_defaults {
         "libhardware",
         "libhardware_legacy",
         "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
         "android.frameworks.stats@1.0",
         "android.hardware.health@2.0",
         "android.hardware.power@1.0",
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index c49b1e496c669..84fe27de15ab1 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -52,7 +52,6 @@ cc_library_shared {
         "libandroidfw",
         "libhidlallocatorutils",
         "libhidlbase",
-        "libhidltransport",
         "android.hardware.cas@1.0",
         "android.hardware.cas.native@1.0",
         "android.hidl.memory@1.0",
@@ -147,7 +146,6 @@ cc_library_shared {
         "android.hidl.memory@1.0",
         "libhidlbase",
         "libhidlmemory",
-        "libhidltransport",
         "libbinderthreadstate",
 
         // MediaPlayer2 implementation
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 621849869590a..0482069e17775 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -98,8 +98,6 @@ cc_defaults {
         "libGLESv2",
         "libnetutils",
         "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
         "libutils",
         "libhwui",
         "libbpf_android",
diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index 502aa97bfc68f..e91abb6c4a445 100644
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -20,8 +20,6 @@ java_defaults {
         "libdl_android",
         "libhidl-gen-utils",
         "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
         "libjsoncpp",
         "liblog",
         "liblzma",