From 7e73d5b90831df7fdbced22792e5198fcae897af Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 24 Feb 2017 11:46:32 -0800 Subject: [PATCH] Remove viral dependency on libhwbinder. (2/2) find hardware/interfaces -name Android.mk -exec sed -i -e '/libhwbinder \\/d' {} \; find hardware/interfaces -name Android.bp -exec sed -i -e '/"libhwbinder"/d' {} \; ./hardware/interfaces/update-makefiles.sh Note, automotive has some actual dependencies on libhwbinder, filed b/35758626 for this. Test: everything links Test: (sanity) booted marlin on internal master with these changes Bug: 35710429 Change-Id: I6d0726c8130d00684b978efbdd48e3ae396f12e5 --- audio/2.0/default/Android.mk | 2 -- audio/effect/2.0/default/Android.mk | 1 - audio/effect/2.0/vts/functional/Android.bp | 1 - biometrics/fingerprint/2.1/default/Android.mk | 1 - biometrics/fingerprint/2.1/vts/functional/Android.bp | 1 - boot/1.0/vts/functional/Android.bp | 1 - broadcastradio/1.0/default/Android.mk | 1 - broadcastradio/1.0/vts/functional/Android.bp | 1 - camera/device/3.2/default/Android.bp | 1 - camera/provider/2.4/default/Android.bp | 2 -- configstore/1.0/default/Android.mk | 2 -- contexthub/1.0/default/Android.bp | 1 - contexthub/1.0/default/Android.mk | 1 - drm/1.0/default/Android.mk | 2 -- dumpstate/1.0/default/Android.mk | 1 - evs/1.0/default/Android.bp | 1 - gatekeeper/1.0/default/Android.mk | 2 -- gatekeeper/1.0/vts/functional/Android.bp | 1 - gnss/1.0/default/Android.mk | 2 -- gnss/1.0/vts/functional/Android.bp | 1 - gnss/Android.bp | 3 ++- graphics/allocator/2.0/default/Android.bp | 2 -- graphics/allocator/2.0/vts/functional/Android.bp | 1 - graphics/composer/2.1/default/Android.bp | 3 --- graphics/composer/2.1/vts/functional/Android.bp | 1 - graphics/mapper/2.0/default/Android.bp | 1 - graphics/mapper/2.0/vts/functional/Android.bp | 1 - health/1.0/default/Android.mk | 2 -- keymaster/3.0/default/Android.mk | 2 -- light/2.0/default/Android.mk | 2 -- memtrack/1.0/default/Android.bp | 2 -- memtrack/1.0/vts/functional/Android.bp | 1 - power/1.0/default/Android.bp | 2 -- power/1.0/vts/functional/Android.bp | 1 - sensors/1.0/default/Android.bp | 2 -- sensors/1.0/default/Android.mk | 1 - soundtrigger/2.0/default/Android.mk | 1 - soundtrigger/2.0/vts/functional/Android.bp | 1 - tests/extension/light/2.0/default/Android.mk | 1 - thermal/1.0/default/Android.bp | 1 - thermal/1.0/default/Android.mk | 1 - thermal/1.0/vts/functional/Android.bp | 1 - tv/cec/1.0/default/Android.mk | 2 -- tv/input/1.0/default/Android.mk | 2 -- tv/input/1.0/vts/functional/Android.bp | 1 - usb/1.0/default/Android.mk | 1 - usb/1.0/vts/functional/Android.bp | 1 - vibrator/1.0/default/Android.bp | 1 - vibrator/1.0/default/Android.mk | 1 - vr/1.0/default/Android.bp | 2 -- 50 files changed, 2 insertions(+), 68 deletions(-) diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk index 9cb56c7628..a1ac61d52b 100644 --- a/audio/2.0/default/Android.mk +++ b/audio/2.0/default/Android.mk @@ -37,7 +37,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ libhidlbase \ libhidltransport \ - libhwbinder \ liblog \ libutils \ android.hardware.audio@2.0 \ @@ -64,7 +63,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ liblog \ - libhwbinder \ libutils \ libhardware \ android.hardware.audio@2.0 \ diff --git a/audio/effect/2.0/default/Android.mk b/audio/effect/2.0/default/Android.mk index 1541d41a88..bbcf2984b6 100644 --- a/audio/effect/2.0/default/Android.mk +++ b/audio/effect/2.0/default/Android.mk @@ -29,7 +29,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidlmemory \ libhidltransport \ - libhwbinder \ liblog \ libutils \ android.hardware.audio.common@2.0 \ diff --git a/audio/effect/2.0/vts/functional/Android.bp b/audio/effect/2.0/vts/functional/Android.bp index 65fafad95c..df80dba4ed 100644 --- a/audio/effect/2.0/vts/functional/Android.bp +++ b/audio/effect/2.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.audio.effect@2.0", diff --git a/biometrics/fingerprint/2.1/default/Android.mk b/biometrics/fingerprint/2.1/default/Android.mk index ea20130c55..3d06397cdd 100644 --- a/biometrics/fingerprint/2.1/default/Android.mk +++ b/biometrics/fingerprint/2.1/default/Android.mk @@ -15,7 +15,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ libhardware \ - libhwbinder \ libkeystore_binder \ libutils \ android.hardware.biometrics.fingerprint@2.1 \ diff --git a/biometrics/fingerprint/2.1/vts/functional/Android.bp b/biometrics/fingerprint/2.1/vts/functional/Android.bp index 7e5e6998a1..ee1a9feefa 100644 --- a/biometrics/fingerprint/2.1/vts/functional/Android.bp +++ b/biometrics/fingerprint/2.1/vts/functional/Android.bp @@ -22,7 +22,6 @@ cc_test { "libbase", "libhidltransport", "libhardware", - "libhwbinder", "libhidlbase", "liblog", "libutils", diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp index 2fd3ee42d6..5081162836 100644 --- a/boot/1.0/vts/functional/Android.bp +++ b/boot/1.0/vts/functional/Android.bp @@ -23,7 +23,6 @@ cc_test { "liblog", "libcutils", "libhidlbase", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.boot@1.0", diff --git a/broadcastradio/1.0/default/Android.mk b/broadcastradio/1.0/default/Android.mk index 569291ee94..bb325953f4 100644 --- a/broadcastradio/1.0/default/Android.mk +++ b/broadcastradio/1.0/default/Android.mk @@ -13,7 +13,6 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ liblog \ libhardware \ diff --git a/broadcastradio/1.0/vts/functional/Android.bp b/broadcastradio/1.0/vts/functional/Android.bp index 2316edb5e5..d6088775a4 100644 --- a/broadcastradio/1.0/vts/functional/Android.bp +++ b/broadcastradio/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.broadcastradio@1.0", diff --git a/camera/device/3.2/default/Android.bp b/camera/device/3.2/default/Android.bp index 62e3c3e5d7..f638f6f761 100644 --- a/camera/device/3.2/default/Android.bp +++ b/camera/device/3.2/default/Android.bp @@ -6,7 +6,6 @@ cc_library_shared { shared_libs: [ "libhidlbase", "libhidltransport", - "libhwbinder", "libutils", "libcutils", "android.hardware.camera.device@3.2", diff --git a/camera/provider/2.4/default/Android.bp b/camera/provider/2.4/default/Android.bp index e0ae12f2b5..7315292282 100644 --- a/camera/provider/2.4/default/Android.bp +++ b/camera/provider/2.4/default/Android.bp @@ -6,7 +6,6 @@ cc_library_shared { shared_libs: [ "libhidlbase", "libhidltransport", - "libhwbinder", "libutils", "libcutils", "android.hardware.camera.device@1.0", @@ -34,7 +33,6 @@ cc_binary { "libhidlbase", "libhidltransport", "liblog", - "libhwbinder", "libutils", "libhardware", "android.hardware.camera.device@1.0", diff --git a/configstore/1.0/default/Android.mk b/configstore/1.0/default/Android.mk index 116126d97d..b168029f23 100644 --- a/configstore/1.0/default/Android.mk +++ b/configstore/1.0/default/Android.mk @@ -13,7 +13,6 @@ LOCAL_SHARED_LIBRARIES := \ libbase \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ android.hardware.configstore@1.0 \ android.hidl.base@1.0 @@ -35,7 +34,6 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libhidlbase \ libhidltransport \ - libhwbinder \ android.hardware.configstore@1.0 \ include $(BUILD_EXECUTABLE) diff --git a/contexthub/1.0/default/Android.bp b/contexthub/1.0/default/Android.bp index 0e1dc7758d..32ab0e0f52 100644 --- a/contexthub/1.0/default/Android.bp +++ b/contexthub/1.0/default/Android.bp @@ -23,7 +23,6 @@ cc_library_shared { "liblog", "libcutils", "libhardware", - "libhwbinder", "libbase", "libcutils", "libutils", diff --git a/contexthub/1.0/default/Android.mk b/contexthub/1.0/default/Android.mk index cc36b7f5c9..538a6b2de3 100644 --- a/contexthub/1.0/default/Android.mk +++ b/contexthub/1.0/default/Android.mk @@ -16,7 +16,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware_legacy \ libhidlbase \ libhidltransport \ - libhwbinder \ liblog \ libutils \ android.hardware.contexthub@1.0 \ diff --git a/drm/1.0/default/Android.mk b/drm/1.0/default/Android.mk index ea6cca0dcd..f2334a0838 100644 --- a/drm/1.0/default/Android.mk +++ b/drm/1.0/default/Android.mk @@ -32,7 +32,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ libhardware \ - libhwbinder \ liblog \ libutils \ @@ -64,7 +63,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidlmemory \ libhidltransport \ - libhwbinder \ liblog \ libmediadrm \ libstagefright_foundation \ diff --git a/dumpstate/1.0/default/Android.mk b/dumpstate/1.0/default/Android.mk index ed9ef97301..0b07f493d0 100644 --- a/dumpstate/1.0/default/Android.mk +++ b/dumpstate/1.0/default/Android.mk @@ -16,7 +16,6 @@ LOCAL_SHARED_LIBRARIES := \ libdumpstateutil \ libhidlbase \ libhidltransport \ - libhwbinder \ liblog \ libutils diff --git a/evs/1.0/default/Android.bp b/evs/1.0/default/Android.bp index 7be365a8d8..c47f035cb4 100644 --- a/evs/1.0/default/Android.bp +++ b/evs/1.0/default/Android.bp @@ -19,7 +19,6 @@ cc_binary { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libutils", ], diff --git a/gatekeeper/1.0/default/Android.mk b/gatekeeper/1.0/default/Android.mk index 94dc1eaad5..d08453555c 100644 --- a/gatekeeper/1.0/default/Android.mk +++ b/gatekeeper/1.0/default/Android.mk @@ -14,7 +14,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ liblog \ @@ -35,7 +34,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ liblog \ diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp index 0b6ecfebe2..080152d46b 100644 --- a/gatekeeper/1.0/vts/functional/Android.bp +++ b/gatekeeper/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.gatekeeper@1.0", diff --git a/gnss/1.0/default/Android.mk b/gnss/1.0/default/Android.mk index b4ef9a8289..5ad5e505ce 100644 --- a/gnss/1.0/default/Android.mk +++ b/gnss/1.0/default/Android.mk @@ -23,7 +23,6 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ android.hardware.gnss@1.0 \ libhardware @@ -50,7 +49,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.gnss@1.0 \ diff --git a/gnss/1.0/vts/functional/Android.bp b/gnss/1.0/vts/functional/Android.bp index 42f2ce8f2a..5e27b671cf 100644 --- a/gnss/1.0/vts/functional/Android.bp +++ b/gnss/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libnativehelper", "libutils", diff --git a/gnss/Android.bp b/gnss/Android.bp index eabbe858c0..33f70ebae2 100644 --- a/gnss/Android.bp +++ b/gnss/Android.bp @@ -1,4 +1,5 @@ +// This is an autogenerated file, do not edit. subdirs = [ "1.0", "1.0/vts/functional", -] \ No newline at end of file +] diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp index 315893fe35..67409d7b93 100644 --- a/graphics/allocator/2.0/default/Android.bp +++ b/graphics/allocator/2.0/default/Android.bp @@ -11,7 +11,6 @@ cc_library_shared { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libutils", ], @@ -28,7 +27,6 @@ cc_binary { "android.hardware.graphics.allocator@2.0", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libutils", ], diff --git a/graphics/allocator/2.0/vts/functional/Android.bp b/graphics/allocator/2.0/vts/functional/Android.bp index 498fbb6812..8c0480b4a1 100644 --- a/graphics/allocator/2.0/vts/functional/Android.bp +++ b/graphics/allocator/2.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "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 4a5c70d8e9..d1173eb263 100644 --- a/graphics/composer/2.1/default/Android.bp +++ b/graphics/composer/2.1/default/Android.bp @@ -11,7 +11,6 @@ cc_library_static { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libsync", "libutils", @@ -33,7 +32,6 @@ cc_library_shared { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libsync", "libutils", @@ -57,7 +55,6 @@ cc_binary { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libsync", "libutils", diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp index cc9ae3a138..1b8f351512 100644 --- a/graphics/composer/2.1/vts/functional/Android.bp +++ b/graphics/composer/2.1/vts/functional/Android.bp @@ -27,7 +27,6 @@ cc_test { "libfmq", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libnativehelper", "libsync", diff --git a/graphics/mapper/2.0/default/Android.bp b/graphics/mapper/2.0/default/Android.bp index ca159613ba..7e98faaf1d 100644 --- a/graphics/mapper/2.0/default/Android.bp +++ b/graphics/mapper/2.0/default/Android.bp @@ -27,7 +27,6 @@ cc_library_shared { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libutils", ], diff --git a/graphics/mapper/2.0/vts/functional/Android.bp b/graphics/mapper/2.0/vts/functional/Android.bp index fbba38e765..79e1a44afc 100644 --- a/graphics/mapper/2.0/vts/functional/Android.bp +++ b/graphics/mapper/2.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libsync", "libutils", diff --git a/health/1.0/default/Android.mk b/health/1.0/default/Android.mk index 3c97185807..96ff91fe7b 100644 --- a/health/1.0/default/Android.mk +++ b/health/1.0/default/Android.mk @@ -12,7 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libhidlbase \ libhidltransport \ - libhwbinder \ liblog \ libutils \ android.hardware.health@1.0 \ @@ -51,7 +50,6 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ libbase \ libutils \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.health@1.0 \ diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk index 87a8a051e5..c53734607e 100644 --- a/keymaster/3.0/default/Android.mk +++ b/keymaster/3.0/default/Android.mk @@ -14,7 +14,6 @@ LOCAL_SHARED_LIBRARIES := \ libkeymaster1 \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ libhardware \ android.hardware.keymaster@3.0 @@ -37,7 +36,6 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libhardware_legacy \ libhardware \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.keymaster@3.0 diff --git a/light/2.0/default/Android.mk b/light/2.0/default/Android.mk index 7bd096c86c..3439c9b67a 100644 --- a/light/2.0/default/Android.mk +++ b/light/2.0/default/Android.mk @@ -10,7 +10,6 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ liblog \ libcutils \ @@ -39,7 +38,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.light@2.0 \ diff --git a/memtrack/1.0/default/Android.bp b/memtrack/1.0/default/Android.bp index b43a159be0..dcb50254fc 100644 --- a/memtrack/1.0/default/Android.bp +++ b/memtrack/1.0/default/Android.bp @@ -24,7 +24,6 @@ cc_library_shared { "libhidlbase", "libhidltransport", "libhardware", - "libhwbinder", "libutils", "android.hardware.memtrack@1.0", ], @@ -46,7 +45,6 @@ cc_binary { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "android.hardware.memtrack@1.0", ], diff --git a/memtrack/1.0/vts/functional/Android.bp b/memtrack/1.0/vts/functional/Android.bp index 1cbcc59ed9..b9d89be6c9 100644 --- a/memtrack/1.0/vts/functional/Android.bp +++ b/memtrack/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhardware", "libhidlbase", - "libhwbinder", "libutils", "android.hardware.memtrack@1.0", ], diff --git a/power/1.0/default/Android.bp b/power/1.0/default/Android.bp index 71daaebe72..b3876df782 100644 --- a/power/1.0/default/Android.bp +++ b/power/1.0/default/Android.bp @@ -28,7 +28,6 @@ cc_library_shared { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "libutils", "android.hardware.power@1.0", ], @@ -54,7 +53,6 @@ cc_binary { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "android.hardware.power@1.0", ], diff --git a/power/1.0/vts/functional/Android.bp b/power/1.0/vts/functional/Android.bp index b2389a53dd..9d1118e2a5 100644 --- a/power/1.0/vts/functional/Android.bp +++ b/power/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.power@1.0", diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp index 3930504c9f..1d8d6a479d 100644 --- a/sensors/1.0/default/Android.bp +++ b/sensors/1.0/default/Android.bp @@ -7,7 +7,6 @@ cc_library_shared { "liblog", "libcutils", "libhardware", - "libhwbinder", "libbase", "libutils", "libhidlbase", @@ -29,7 +28,6 @@ cc_library_static { "liblog", "libcutils", "libhardware", - "libhwbinder", "libbase", "libutils", "libhidlbase", diff --git a/sensors/1.0/default/Android.mk b/sensors/1.0/default/Android.mk index 6a1aab4249..bc1cfbdeb0 100644 --- a/sensors/1.0/default/Android.mk +++ b/sensors/1.0/default/Android.mk @@ -18,7 +18,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.sensors@1.0 \ diff --git a/soundtrigger/2.0/default/Android.mk b/soundtrigger/2.0/default/Android.mk index 70c78e0728..068c6b4bbd 100644 --- a/soundtrigger/2.0/default/Android.mk +++ b/soundtrigger/2.0/default/Android.mk @@ -27,7 +27,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ liblog \ - libhwbinder \ libutils \ libhardware \ android.hardware.soundtrigger@2.0 \ diff --git a/soundtrigger/2.0/vts/functional/Android.bp b/soundtrigger/2.0/vts/functional/Android.bp index 7e2e12ad5b..700b2131b5 100644 --- a/soundtrigger/2.0/vts/functional/Android.bp +++ b/soundtrigger/2.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.soundtrigger@2.0", diff --git a/tests/extension/light/2.0/default/Android.mk b/tests/extension/light/2.0/default/Android.mk index 4dee3eee44..b30d11c848 100644 --- a/tests/extension/light/2.0/default/Android.mk +++ b/tests/extension/light/2.0/default/Android.mk @@ -12,7 +12,6 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ android.hardware.light@2.0 \ android.hardware.tests.extension.light@2.0 \ diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp index 96f69cc95c..0b068e7fb1 100644 --- a/thermal/1.0/default/Android.bp +++ b/thermal/1.0/default/Android.bp @@ -7,7 +7,6 @@ cc_library_shared { "liblog", "libcutils", "libhardware", - "libhwbinder", "libbase", "libcutils", "libutils", diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk index 72c46affa8..2d25dc3e68 100644 --- a/thermal/1.0/default/Android.mk +++ b/thermal/1.0/default/Android.mk @@ -33,7 +33,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.thermal@1.0 \ diff --git a/thermal/1.0/vts/functional/Android.bp b/thermal/1.0/vts/functional/Android.bp index 92f8c49a18..63f0ba99a3 100644 --- a/thermal/1.0/vts/functional/Android.bp +++ b/thermal/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.thermal@1.0", diff --git a/tv/cec/1.0/default/Android.mk b/tv/cec/1.0/default/Android.mk index 3f986e6d59..9d37344e50 100644 --- a/tv/cec/1.0/default/Android.mk +++ b/tv/cec/1.0/default/Android.mk @@ -10,7 +10,6 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ - libhwbinder \ liblog \ libbase \ libutils \ @@ -38,7 +37,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.tv.cec@1.0 \ diff --git a/tv/input/1.0/default/Android.mk b/tv/input/1.0/default/Android.mk index be1775d487..210da86c86 100644 --- a/tv/input/1.0/default/Android.mk +++ b/tv/input/1.0/default/Android.mk @@ -13,7 +13,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ libhidlbase \ libhidltransport \ - libhwbinder \ libutils \ android.hardware.audio.common@2.0 \ android.hardware.tv.input@1.0 \ @@ -38,7 +37,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.audio.common@2.0 \ diff --git a/tv/input/1.0/vts/functional/Android.bp b/tv/input/1.0/vts/functional/Android.bp index b93111dce9..e3785abb75 100644 --- a/tv/input/1.0/vts/functional/Android.bp +++ b/tv/input/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.tv.input@1.0", diff --git a/usb/1.0/default/Android.mk b/usb/1.0/default/Android.mk index 489293c0eb..afd53cfc71 100644 --- a/usb/1.0/default/Android.mk +++ b/usb/1.0/default/Android.mk @@ -14,7 +14,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ liblog \ - libhwbinder \ libutils \ libhardware \ android.hardware.usb@1.0 \ diff --git a/usb/1.0/vts/functional/Android.bp b/usb/1.0/vts/functional/Android.bp index de11a8c112..6f3d1befd5 100644 --- a/usb/1.0/vts/functional/Android.bp +++ b/usb/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.usb@1.0", diff --git a/vibrator/1.0/default/Android.bp b/vibrator/1.0/default/Android.bp index 6cb980292c..3bd317f0c8 100644 --- a/vibrator/1.0/default/Android.bp +++ b/vibrator/1.0/default/Android.bp @@ -22,7 +22,6 @@ cc_library_shared { "libhidlbase", "libhidltransport", "liblog", - "libhwbinder", "libutils", "libhardware", "android.hardware.vibrator@1.0", diff --git a/vibrator/1.0/default/Android.mk b/vibrator/1.0/default/Android.mk index 091d61514a..af4a955a63 100644 --- a/vibrator/1.0/default/Android.mk +++ b/vibrator/1.0/default/Android.mk @@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \ liblog \ - libhwbinder \ libutils \ libhardware \ android.hardware.vibrator@1.0 diff --git a/vr/1.0/default/Android.bp b/vr/1.0/default/Android.bp index 0d374d351c..e7afa9ab6d 100644 --- a/vr/1.0/default/Android.bp +++ b/vr/1.0/default/Android.bp @@ -7,7 +7,6 @@ cc_library_shared { "liblog", "libcutils", "libhardware", - "libhwbinder", "libbase", "libcutils", "libutils", @@ -30,7 +29,6 @@ cc_binary { "libhardware", "libhidlbase", "libhidltransport", - "libhwbinder", "android.hardware.vr@1.0", ], }