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
2026-02-01 11:36:00 +00:00 · 2017-02-24 11:46:32 -08:00
parent dbd6d31f62
commit 7e73d5b908
50 changed files with 2 additions and 68 deletions
--- 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 \
--- 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 \
--- 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",
--- 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 \
--- 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",
--- 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",
--- 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 \
--- 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",
--- 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",
--- 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",
--- 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)
--- 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",
--- 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 \
--- 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 \
--- 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

--- 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",
    ],
--- 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 \

--- 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",
--- 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 \
--- 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",
--- 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",
-]
+]
--- 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",
    ],
--- 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",
--- 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",
--- 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",
--- 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",
    ],
--- 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",
--- 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 \
--- 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
--- 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 \
--- 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",
    ],

--- 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",
    ],
--- 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",
    ],

--- 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",
--- 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",
--- 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 \
--- 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 \
--- 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",
--- 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 \
--- 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",
--- 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 \
--- 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",
--- 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 \
--- 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 \
--- 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",
--- 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 \
--- 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",
--- 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",
--- 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
--- 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",
    ],
 }