From: Steven Moreland Date: Fri, 24 Feb 2017 19:20:04 +0000 (-0800) Subject: Remove viral dependency on libhwbinder. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d28a3dce40;p=android-x86%2Fhardware-interfaces.git Remove viral dependency on libhwbinder. 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 Test: everything links Test: (sanity) booted marlin on internal master with these changes Bug: 35710429 Change-Id: I6b0b5ae318422b7a9be17a19a79e039ffc0f9272 --- diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp index 69cefd66..2ae262c2 100644 --- a/bluetooth/1.0/default/Android.bp +++ b/bluetooth/1.0/default/Android.bp @@ -26,7 +26,6 @@ cc_library_shared { "libbase", "libcutils", "libhardware", - "libhwbinder", "libhidlbase", "libhidltransport", "liblog", diff --git a/bluetooth/1.0/default/Android.mk b/bluetooth/1.0/default/Android.mk index 08bfb4e9..5043fb9e 100644 --- a/bluetooth/1.0/default/Android.mk +++ b/bluetooth/1.0/default/Android.mk @@ -32,7 +32,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.bluetooth@1.0 \ diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index 2012c20c..939a07f6 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.bluetooth@1.0", diff --git a/boot/1.0/default/Android.mk b/boot/1.0/default/Android.mk index 99a6cf99..5e7ecb40 100644 --- a/boot/1.0/default/Android.mk +++ b/boot/1.0/default/Android.mk @@ -11,7 +11,6 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libhidlbase \ libhidltransport \ - libhwbinder \ libhardware \ libutils \ android.hardware.boot@1.0 \ @@ -28,7 +27,6 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ liblog \ - libhwbinder \ libhardware \ libhidlbase \ libhidltransport \ diff --git a/ir/1.0/default/Android.bp b/ir/1.0/default/Android.bp index ed0b8079..151a9af5 100644 --- a/ir/1.0/default/Android.bp +++ b/ir/1.0/default/Android.bp @@ -21,7 +21,6 @@ cc_library_shared { "libhidlbase", "libhidltransport", "libhardware", - "libhwbinder", "liblog", "libutils", "android.hardware.ir@1.0", @@ -37,7 +36,6 @@ cc_binary { shared_libs: [ "liblog", - "libhwbinder", "libhardware", "libhidlbase", "libhidltransport", diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp index 56894745..ac29996d 100644 --- a/ir/1.0/vts/functional/Android.bp +++ b/ir/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libutils", "android.hardware.ir@1.0", ], diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp index 02f5664a..051ca54d 100644 --- a/nfc/1.0/default/Android.bp +++ b/nfc/1.0/default/Android.bp @@ -7,7 +7,6 @@ cc_library_shared { "liblog", "libcutils", "libhardware", - "libhwbinder", "libbase", "libcutils", "libutils", diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk index fbb340f2..2e1f17f0 100644 --- a/nfc/1.0/default/Android.mk +++ b/nfc/1.0/default/Android.mk @@ -18,7 +18,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ LOCAL_SHARED_LIBRARIES += \ - libhwbinder \ libhidlbase \ libhidltransport \ android.hardware.nfc@1.0 \ diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp index 080887fb..23d83e54 100644 --- a/nfc/1.0/vts/functional/Android.bp +++ b/nfc/1.0/vts/functional/Android.bp @@ -24,7 +24,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.nfc@1.0", diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 6615f03f..03434f49 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -27,7 +27,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.radio@1.0", diff --git a/renderscript/1.0/default/Android.bp b/renderscript/1.0/default/Android.bp index 348f6af2..564d6db1 100644 --- a/renderscript/1.0/default/Android.bp +++ b/renderscript/1.0/default/Android.bp @@ -14,7 +14,6 @@ cc_library_shared { "liblog", "libhidlbase", "libhidltransport", - "libhwbinder", "libutils", "android.hardware.renderscript@1.0", "android.hidl.base@1.0", diff --git a/tests/bar/1.0/default/Android.bp b/tests/bar/1.0/default/Android.bp index 2c79357c..14506c54 100644 --- a/tests/bar/1.0/default/Android.bp +++ b/tests/bar/1.0/default/Android.bp @@ -14,7 +14,6 @@ cc_library_shared { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libutils", "android.hardware.tests.foo@1.0", diff --git a/tests/foo/1.0/default/Android.bp b/tests/foo/1.0/default/Android.bp index f4a80d54..77e617ca 100644 --- a/tests/foo/1.0/default/Android.bp +++ b/tests/foo/1.0/default/Android.bp @@ -14,7 +14,6 @@ cc_library_shared { "libhidlbase", "libhidltransport", "libfootest", - "libhwbinder", "liblog", "libutils", "android.hardware.tests.foo@1.0", diff --git a/tests/foo/1.0/default/lib/Android.bp b/tests/foo/1.0/default/lib/Android.bp index 7873203f..708cf43f 100644 --- a/tests/foo/1.0/default/lib/Android.bp +++ b/tests/foo/1.0/default/lib/Android.bp @@ -7,7 +7,6 @@ cc_library_shared { shared_libs: [ "libhidlbase", "libhidltransport", - "libhwbinder", "android.hardware.tests.foo@1.0", ], local_include_dirs: ["include/hidl-test"], diff --git a/tests/inheritance/1.0/default/Android.bp b/tests/inheritance/1.0/default/Android.bp index 090c36ea..a67dc09d 100644 --- a/tests/inheritance/1.0/default/Android.bp +++ b/tests/inheritance/1.0/default/Android.bp @@ -14,7 +14,6 @@ cc_library_shared { "libbase", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libutils", "android.hardware.tests.inheritance@1.0", diff --git a/tests/libhwbinder/1.0/default/Android.bp b/tests/libhwbinder/1.0/default/Android.bp index 0edabfc5..6e8fbb1c 100644 --- a/tests/libhwbinder/1.0/default/Android.bp +++ b/tests/libhwbinder/1.0/default/Android.bp @@ -10,7 +10,6 @@ cc_library_shared { "libbase", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "libutils", "android.hardware.tests.libhwbinder@1.0", diff --git a/tests/memory/1.0/default/Android.bp b/tests/memory/1.0/default/Android.bp index 14dc08d8..40716da9 100644 --- a/tests/memory/1.0/default/Android.bp +++ b/tests/memory/1.0/default/Android.bp @@ -22,7 +22,6 @@ cc_library_shared { shared_libs: [ "libhidlbase", "libhidltransport", - "libhwbinder", "libhidlmemory", "liblog", "libutils", diff --git a/tests/pointer/1.0/default/Android.bp b/tests/pointer/1.0/default/Android.bp index ab7f8fa3..c4dc0134 100644 --- a/tests/pointer/1.0/default/Android.bp +++ b/tests/pointer/1.0/default/Android.bp @@ -14,7 +14,6 @@ cc_library_shared { "libhidlbase", "libhidltransport", "libpointertest", - "libhwbinder", "liblog", "libutils", "android.hardware.tests.pointer@1.0", diff --git a/tests/pointer/1.0/default/lib/Android.bp b/tests/pointer/1.0/default/lib/Android.bp index a7203c7a..77379327 100644 --- a/tests/pointer/1.0/default/lib/Android.bp +++ b/tests/pointer/1.0/default/lib/Android.bp @@ -8,7 +8,6 @@ cc_library_shared { "libbase", "libhidlbase", "libhidltransport", - "libhwbinder", "liblog", "android.hardware.tests.pointer@1.0", ], diff --git a/wifi/1.0/default/Android.mk b/wifi/1.0/default/Android.mk index 2d2d8987..00e5f988 100644 --- a/wifi/1.0/default/Android.mk +++ b/wifi/1.0/default/Android.mk @@ -39,7 +39,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libhidlbase \ libhidltransport \ - libhwbinder \ liblog \ libnl \ libutils \ diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 01eeef59..dc361396 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -34,7 +34,6 @@ cc_test { "libcutils", "libhidlbase", "libhidltransport", - "libhwbinder", "libnativehelper", "libutils", "android.hardware.wifi@1.0", diff --git a/wifi/supplicant/1.0/vts/functional/Android.mk b/wifi/supplicant/1.0/vts/functional/Android.mk index 52fecc25..5d7c763d 100644 --- a/wifi/supplicant/1.0/vts/functional/Android.mk +++ b/wifi/supplicant/1.0/vts/functional/Android.mk @@ -31,7 +31,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libhidlbase \ libhidltransport \ - libhwbinder \ liblog \ libutils \ libwifi-hal \