Merge "Fix bugs in power HAL VTS test"
diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk
index 9cb56c7..a1ac61d 100644
--- a/audio/2.0/default/Android.mk
+++ b/audio/2.0/default/Android.mk
@@ -37,7 +37,6 @@
libhardware \
libhidlbase \
libhidltransport \
- libhwbinder \
liblog \
libutils \
android.hardware.audio@2.0 \
@@ -64,7 +63,6 @@
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 1541d41..bbcf298 100644
--- a/audio/effect/2.0/default/Android.mk
+++ b/audio/effect/2.0/default/Android.mk
@@ -29,7 +29,6 @@
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 65fafad..df80dba 100644
--- a/audio/effect/2.0/vts/functional/Android.bp
+++ b/audio/effect/2.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libnativehelper",
"libutils",
"android.hardware.audio.effect@2.0",
diff --git a/automotive/vehicle/2.0/default/VehicleService.cpp b/automotive/vehicle/2.0/default/VehicleService.cpp
index f88ce7b..95057cc 100644
--- a/automotive/vehicle/2.0/default/VehicleService.cpp
+++ b/automotive/vehicle/2.0/default/VehicleService.cpp
@@ -34,7 +34,7 @@
configureRpcThreadpool(1, true /* callerWillJoin */);
ALOGI("Registering as service...");
- service->registerAsService("Vehicle");
+ service->registerAsService();
ALOGI("Ready");
joinRpcThreadpool();
diff --git a/biometrics/fingerprint/2.1/default/Android.mk b/biometrics/fingerprint/2.1/default/Android.mk
index ea20130..3d06397 100644
--- a/biometrics/fingerprint/2.1/default/Android.mk
+++ b/biometrics/fingerprint/2.1/default/Android.mk
@@ -15,7 +15,6 @@
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 7e5e699..ee1a9fe 100644
--- a/biometrics/fingerprint/2.1/vts/functional/Android.bp
+++ b/biometrics/fingerprint/2.1/vts/functional/Android.bp
@@ -22,7 +22,6 @@
"libbase",
"libhidltransport",
"libhardware",
- "libhwbinder",
"libhidlbase",
"liblog",
"libutils",
diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp
index 69cefd6..2ae262c 100644
--- a/bluetooth/1.0/default/Android.bp
+++ b/bluetooth/1.0/default/Android.bp
@@ -26,7 +26,6 @@
"libbase",
"libcutils",
"libhardware",
- "libhwbinder",
"libhidlbase",
"libhidltransport",
"liblog",
diff --git a/bluetooth/1.0/default/Android.mk b/bluetooth/1.0/default/Android.mk
index 08bfb4e..5043fb9 100644
--- a/bluetooth/1.0/default/Android.mk
+++ b/bluetooth/1.0/default/Android.mk
@@ -32,7 +32,6 @@
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 2012c20..939a07f 100644
--- a/bluetooth/1.0/vts/functional/Android.bp
+++ b/bluetooth/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"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 99a6cf9..5e7ecb4 100644
--- a/boot/1.0/default/Android.mk
+++ b/boot/1.0/default/Android.mk
@@ -11,7 +11,6 @@
liblog \
libhidlbase \
libhidltransport \
- libhwbinder \
libhardware \
libutils \
android.hardware.boot@1.0 \
@@ -28,7 +27,6 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
- libhwbinder \
libhardware \
libhidlbase \
libhidltransport \
diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp
index 2fd3ee4..5081162 100644
--- a/boot/1.0/vts/functional/Android.bp
+++ b/boot/1.0/vts/functional/Android.bp
@@ -23,7 +23,6 @@
"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 569291e..bb32595 100644
--- a/broadcastradio/1.0/default/Android.mk
+++ b/broadcastradio/1.0/default/Android.mk
@@ -13,7 +13,6 @@
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 2316edb..d608877 100644
--- a/broadcastradio/1.0/vts/functional/Android.bp
+++ b/broadcastradio/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"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 62e3c3e..f638f6f 100644
--- a/camera/device/3.2/default/Android.bp
+++ b/camera/device/3.2/default/Android.bp
@@ -6,7 +6,6 @@
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 e0ae12f..7315292 100644
--- a/camera/provider/2.4/default/Android.bp
+++ b/camera/provider/2.4/default/Android.bp
@@ -6,7 +6,6 @@
shared_libs: [
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libutils",
"libcutils",
"android.hardware.camera.device@1.0",
@@ -34,7 +33,6 @@
"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 116126d..b168029 100644
--- a/configstore/1.0/default/Android.mk
+++ b/configstore/1.0/default/Android.mk
@@ -13,7 +13,6 @@
libbase \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
android.hardware.configstore@1.0 \
android.hidl.base@1.0
@@ -35,7 +34,6 @@
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 0e1dc77..32ab0e0 100644
--- a/contexthub/1.0/default/Android.bp
+++ b/contexthub/1.0/default/Android.bp
@@ -23,7 +23,6 @@
"liblog",
"libcutils",
"libhardware",
- "libhwbinder",
"libbase",
"libcutils",
"libutils",
diff --git a/contexthub/1.0/default/Android.mk b/contexthub/1.0/default/Android.mk
index cc36b7f..538a6b2 100644
--- a/contexthub/1.0/default/Android.mk
+++ b/contexthub/1.0/default/Android.mk
@@ -16,7 +16,6 @@
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 ea6cca0..f2334a0 100644
--- a/drm/1.0/default/Android.mk
+++ b/drm/1.0/default/Android.mk
@@ -32,7 +32,6 @@
libhidlbase \
libhidltransport \
libhardware \
- libhwbinder \
liblog \
libutils \
@@ -64,7 +63,6 @@
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 ed9ef97..0b07f49 100644
--- a/dumpstate/1.0/default/Android.mk
+++ b/dumpstate/1.0/default/Android.mk
@@ -16,7 +16,6 @@
libdumpstateutil \
libhidlbase \
libhidltransport \
- libhwbinder \
liblog \
libutils
diff --git a/dumpstate/1.0/default/service.cpp b/dumpstate/1.0/default/service.cpp
index 0d5bd94..85bea12 100644
--- a/dumpstate/1.0/default/service.cpp
+++ b/dumpstate/1.0/default/service.cpp
@@ -29,6 +29,6 @@
int main (int /* argc */, char * /* argv */ []) {
sp<IDumpstateDevice> dumpstate = new DumpstateDevice;
configureRpcThreadpool(1, true);
- dumpstate->registerAsService("dumpstate");
+ dumpstate->registerAsService();
joinRpcThreadpool();
}
diff --git a/evs/1.0/default/Android.bp b/evs/1.0/default/Android.bp
index 7be365a..c47f035 100644
--- a/evs/1.0/default/Android.bp
+++ b/evs/1.0/default/Android.bp
@@ -19,7 +19,6 @@
"libhardware",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"libutils",
],
diff --git a/gatekeeper/1.0/default/Android.mk b/gatekeeper/1.0/default/Android.mk
index 94dc1ea..d084535 100644
--- a/gatekeeper/1.0/default/Android.mk
+++ b/gatekeeper/1.0/default/Android.mk
@@ -14,7 +14,6 @@
libhardware \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
liblog \
@@ -35,7 +34,6 @@
libhardware \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
liblog \
diff --git a/gatekeeper/1.0/default/service.cpp b/gatekeeper/1.0/default/service.cpp
index 407cf71..5cbdafb 100644
--- a/gatekeeper/1.0/default/service.cpp
+++ b/gatekeeper/1.0/default/service.cpp
@@ -24,5 +24,5 @@
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<IGatekeeper>("gatekeeper");
+ return defaultPassthroughServiceImplementation<IGatekeeper>();
}
diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp
index 0b6ecfe..080152d 100644
--- a/gatekeeper/1.0/vts/functional/Android.bp
+++ b/gatekeeper/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libnativehelper",
"libutils",
"android.hardware.gatekeeper@1.0",
diff --git a/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp b/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp
index 7da2293..bdc3956 100644
--- a/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp
+++ b/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp
@@ -187,7 +187,7 @@
GatekeeperHidlTest() : uid_(0) {}
virtual void SetUp() override {
GatekeeperResponse rsp;
- gatekeeper_ = IGatekeeper::getService("gatekeeper");
+ gatekeeper_ = IGatekeeper::getService();
ASSERT_NE(nullptr, gatekeeper_.get());
doDeleteAllUsers(rsp);
}
diff --git a/gnss/1.0/default/Android.mk b/gnss/1.0/default/Android.mk
index b4ef9a8..5ad5e50 100644
--- a/gnss/1.0/default/Android.mk
+++ b/gnss/1.0/default/Android.mk
@@ -23,7 +23,6 @@
liblog \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
android.hardware.gnss@1.0 \
libhardware
@@ -50,7 +49,6 @@
libhardware \
LOCAL_SHARED_LIBRARIES += \
- libhwbinder \
libhidlbase \
libhidltransport \
android.hardware.gnss@1.0 \
diff --git a/gnss/1.0/default/Gnss.cpp b/gnss/1.0/default/Gnss.cpp
index 10024fb..9493737 100644
--- a/gnss/1.0/default/Gnss.cpp
+++ b/gnss/1.0/default/Gnss.cpp
@@ -676,7 +676,7 @@
return mGnssBatching;
}
-IGnss* HIDL_FETCH_IGnss(const char* hal) {
+IGnss* HIDL_FETCH_IGnss(const char* /* hal */) {
hw_module_t* module;
IGnss* iface = nullptr;
int err = hw_get_module(GPS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
@@ -687,10 +687,10 @@
if (err == 0) {
iface = new Gnss(reinterpret_cast<gps_device_t*>(device));
} else {
- ALOGE("gnssDevice open %s failed: %d", hal, err);
+ ALOGE("gnssDevice open %s failed: %d", GPS_HARDWARE_MODULE_ID, err);
}
} else {
- ALOGE("gnss hw_get_module %s failed: %d", hal, err);
+ ALOGE("gnss hw_get_module %s failed: %d", GPS_HARDWARE_MODULE_ID, err);
}
return iface;
}
diff --git a/gnss/1.0/default/service.cpp b/gnss/1.0/default/service.cpp
index 4e040c5..5a8acc1 100644
--- a/gnss/1.0/default/service.cpp
+++ b/gnss/1.0/default/service.cpp
@@ -8,5 +8,5 @@
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<IGnss>("gnss");
+ return defaultPassthroughServiceImplementation<IGnss>();
}
diff --git a/gnss/1.0/vts/functional/Android.bp b/gnss/1.0/vts/functional/Android.bp
index 42f2ce8..5e27b67 100644
--- a/gnss/1.0/vts/functional/Android.bp
+++ b/gnss/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"libnativehelper",
"libutils",
diff --git a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
index f1cd9ec..3a9de9a 100644
--- a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
+++ b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
@@ -45,7 +45,7 @@
* callbacks trigger.
*/
- gnss_hal_ = IGnss::getService("gnss");
+ gnss_hal_ = IGnss::getService();
ASSERT_NE(gnss_hal_, nullptr);
gnss_cb_ = new GnssCallback(*this);
@@ -276,4 +276,4 @@
int status = RUN_ALL_TESTS();
ALOGI("Test result = %d", status);
return status;
-}
\ No newline at end of file
+}
diff --git a/gnss/Android.bp b/gnss/Android.bp
index eabbe85..33f70eb 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 315893f..67409d7 100644
--- a/graphics/allocator/2.0/default/Android.bp
+++ b/graphics/allocator/2.0/default/Android.bp
@@ -11,7 +11,6 @@
"libhardware",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"libutils",
],
@@ -28,7 +27,6 @@
"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 498fbb6..8c0480b 100644
--- a/graphics/allocator/2.0/vts/functional/Android.bp
+++ b/graphics/allocator/2.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"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 4a5c70d..d1173eb 100644
--- a/graphics/composer/2.1/default/Android.bp
+++ b/graphics/composer/2.1/default/Android.bp
@@ -11,7 +11,6 @@
"libhardware",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"libsync",
"libutils",
@@ -33,7 +32,6 @@
"libhardware",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"libsync",
"libutils",
@@ -57,7 +55,6 @@
"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 cc9ae3a..1b8f351 100644
--- a/graphics/composer/2.1/vts/functional/Android.bp
+++ b/graphics/composer/2.1/vts/functional/Android.bp
@@ -27,7 +27,6 @@
"libfmq",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"libnativehelper",
"libsync",
diff --git a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
index 60cc2a5..d9352e7 100644
--- a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
+++ b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
@@ -134,7 +134,7 @@
class GraphicsComposerHidlTest : public ::testing::Test {
protected:
void SetUp() override {
- mComposer = IComposer::getService("hwcomposer");
+ mComposer = IComposer::getService();
ASSERT_NE(nullptr, mComposer.get());
mComposerClient = createClient();
diff --git a/graphics/mapper/2.0/default/Android.bp b/graphics/mapper/2.0/default/Android.bp
index ca15961..7e98faa 100644
--- a/graphics/mapper/2.0/default/Android.bp
+++ b/graphics/mapper/2.0/default/Android.bp
@@ -27,7 +27,6 @@
"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 fbba38e..79e1a44 100644
--- a/graphics/mapper/2.0/vts/functional/Android.bp
+++ b/graphics/mapper/2.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libnativehelper",
"libsync",
"libutils",
diff --git a/health/1.0/default/Android.mk b/health/1.0/default/Android.mk
index 3c97185..96ff91f 100644
--- a/health/1.0/default/Android.mk
+++ b/health/1.0/default/Android.mk
@@ -12,7 +12,6 @@
libcutils \
libhidlbase \
libhidltransport \
- libhwbinder \
liblog \
libutils \
android.hardware.health@1.0 \
@@ -51,7 +50,6 @@
libdl \
libbase \
libutils \
- libhwbinder \
libhidlbase \
libhidltransport \
android.hardware.health@1.0 \
diff --git a/health/1.0/default/HealthService.cpp b/health/1.0/default/HealthService.cpp
index 107f33d..55848d2 100644
--- a/health/1.0/default/HealthService.cpp
+++ b/health/1.0/default/HealthService.cpp
@@ -23,5 +23,5 @@
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<IHealth>("health");
+ return defaultPassthroughServiceImplementation<IHealth>();
}
diff --git a/ir/1.0/default/Android.bp b/ir/1.0/default/Android.bp
index ed0b807..151a9af 100644
--- a/ir/1.0/default/Android.bp
+++ b/ir/1.0/default/Android.bp
@@ -21,7 +21,6 @@
"libhidlbase",
"libhidltransport",
"libhardware",
- "libhwbinder",
"liblog",
"libutils",
"android.hardware.ir@1.0",
@@ -37,7 +36,6 @@
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 5689474..ac29996 100644
--- a/ir/1.0/vts/functional/Android.bp
+++ b/ir/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libutils",
"android.hardware.ir@1.0",
],
diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 87a8a05..c537346 100644
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -14,7 +14,6 @@
libkeymaster1 \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
libhardware \
android.hardware.keymaster@3.0
@@ -37,7 +36,6 @@
libutils \
libhardware_legacy \
libhardware \
- libhwbinder \
libhidlbase \
libhidltransport \
android.hardware.keymaster@3.0
diff --git a/keymaster/3.0/default/service.cpp b/keymaster/3.0/default/service.cpp
index c4387c3..a6a9a93 100644
--- a/keymaster/3.0/default/service.cpp
+++ b/keymaster/3.0/default/service.cpp
@@ -29,5 +29,5 @@
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<IKeymasterDevice>("keymaster", 1);
+ return defaultPassthroughServiceImplementation<IKeymasterDevice>();
}
diff --git a/light/2.0/default/Android.mk b/light/2.0/default/Android.mk
index 7bd096c..3439c9b 100644
--- a/light/2.0/default/Android.mk
+++ b/light/2.0/default/Android.mk
@@ -10,7 +10,6 @@
LOCAL_SHARED_LIBRARIES := \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
liblog \
libcutils \
@@ -39,7 +38,6 @@
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 b43a159..dcb5025 100644
--- a/memtrack/1.0/default/Android.bp
+++ b/memtrack/1.0/default/Android.bp
@@ -24,7 +24,6 @@
"libhidlbase",
"libhidltransport",
"libhardware",
- "libhwbinder",
"libutils",
"android.hardware.memtrack@1.0",
],
@@ -46,7 +45,6 @@
"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 1cbcc59..b9d89be 100644
--- a/memtrack/1.0/vts/functional/Android.bp
+++ b/memtrack/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhardware",
"libhidlbase",
- "libhwbinder",
"libutils",
"android.hardware.memtrack@1.0",
],
diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp
index 02f5664..051ca54 100644
--- a/nfc/1.0/default/Android.bp
+++ b/nfc/1.0/default/Android.bp
@@ -7,7 +7,6 @@
"liblog",
"libcutils",
"libhardware",
- "libhwbinder",
"libbase",
"libcutils",
"libutils",
diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk
index fbb340f..2e1f17f 100644
--- a/nfc/1.0/default/Android.mk
+++ b/nfc/1.0/default/Android.mk
@@ -18,7 +18,6 @@
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 080887f..23d83e5 100644
--- a/nfc/1.0/vts/functional/Android.bp
+++ b/nfc/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libnativehelper",
"libutils",
"android.hardware.nfc@1.0",
diff --git a/power/1.0/default/Android.bp b/power/1.0/default/Android.bp
index 71daaeb..b3876df 100644
--- a/power/1.0/default/Android.bp
+++ b/power/1.0/default/Android.bp
@@ -28,7 +28,6 @@
"libhardware",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libutils",
"android.hardware.power@1.0",
],
@@ -54,7 +53,6 @@
"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 b2389a5..9d1118e 100644
--- a/power/1.0/vts/functional/Android.bp
+++ b/power/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libnativehelper",
"libutils",
"android.hardware.power@1.0",
diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp
index 6615f03..03434f4 100644
--- a/radio/1.0/vts/functional/Android.bp
+++ b/radio/1.0/vts/functional/Android.bp
@@ -27,7 +27,6 @@
"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 348f6af..564d6db 100644
--- a/renderscript/1.0/default/Android.bp
+++ b/renderscript/1.0/default/Android.bp
@@ -14,7 +14,6 @@
"liblog",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libutils",
"android.hardware.renderscript@1.0",
"android.hidl.base@1.0",
diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp
index 3930504..1d8d6a4 100644
--- a/sensors/1.0/default/Android.bp
+++ b/sensors/1.0/default/Android.bp
@@ -7,7 +7,6 @@
"liblog",
"libcutils",
"libhardware",
- "libhwbinder",
"libbase",
"libutils",
"libhidlbase",
@@ -29,7 +28,6 @@
"liblog",
"libcutils",
"libhardware",
- "libhwbinder",
"libbase",
"libutils",
"libhidlbase",
diff --git a/sensors/1.0/default/Android.mk b/sensors/1.0/default/Android.mk
index 6a1aab4..bc1cfbd 100644
--- a/sensors/1.0/default/Android.mk
+++ b/sensors/1.0/default/Android.mk
@@ -18,7 +18,6 @@
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 70c78e0..068c6b4 100644
--- a/soundtrigger/2.0/default/Android.mk
+++ b/soundtrigger/2.0/default/Android.mk
@@ -27,7 +27,6 @@
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 7e2e12a..700b213 100644
--- a/soundtrigger/2.0/vts/functional/Android.bp
+++ b/soundtrigger/2.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"libnativehelper",
"libutils",
"android.hardware.soundtrigger@2.0",
diff --git a/tests/bar/1.0/default/Android.bp b/tests/bar/1.0/default/Android.bp
index 2c79357..14506c5 100644
--- a/tests/bar/1.0/default/Android.bp
+++ b/tests/bar/1.0/default/Android.bp
@@ -14,7 +14,6 @@
"libcutils",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.foo@1.0",
diff --git a/tests/baz/1.0/IBaz.hal b/tests/baz/1.0/IBaz.hal
index 40e4024..e4eb145 100644
--- a/tests/baz/1.0/IBaz.hal
+++ b/tests/baz/1.0/IBaz.hal
@@ -21,6 +21,14 @@
interface IBaz extends IBase {
+ enum BitField : uint8_t {
+ V0 = 1 << 0,
+ V1 = 1 << 1,
+ V2 = 1 << 2,
+ V3 = 1 << 3,
+ VALL = V0 | V1 | V2 | V3,
+ };
+
enum SomeOtherEnum : uint8_t {
bar = 66
};
@@ -45,6 +53,21 @@
vec<T> matrices;
};
+ struct Quux {
+ string first;
+ string last;
+ };
+ struct Everything {
+ int8_t number;
+ int32_t anotherNumber;
+ string s;
+ vec<string> vs;
+ string[2][2] multidimArray;
+ string[3] sArray;
+ Quux anotherStruct;
+ bitfield<BitField> bf;
+ };
+
@Fragile @NoReally(very="yes", array={"a","b","c"})
oneway doThis(float param);
diff --git a/tests/extension/light/2.0/default/Android.mk b/tests/extension/light/2.0/default/Android.mk
index 4dee3ee..b30d11c 100644
--- a/tests/extension/light/2.0/default/Android.mk
+++ b/tests/extension/light/2.0/default/Android.mk
@@ -12,7 +12,6 @@
LOCAL_SHARED_LIBRARIES := \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
android.hardware.light@2.0 \
android.hardware.tests.extension.light@2.0 \
diff --git a/tests/foo/1.0/IFoo.hal b/tests/foo/1.0/IFoo.hal
index 76aefcf..a43b883 100644
--- a/tests/foo/1.0/IFoo.hal
+++ b/tests/foo/1.0/IFoo.hal
@@ -38,6 +38,7 @@
V1 = 1 << 1,
V2 = 1 << 2,
V3 = 1 << 3,
+ VALL = V0 | V1 | V2 | V3,
};
struct Fumble {
diff --git a/tests/foo/1.0/default/Android.bp b/tests/foo/1.0/default/Android.bp
index f4a80d5..77e617c 100644
--- a/tests/foo/1.0/default/Android.bp
+++ b/tests/foo/1.0/default/Android.bp
@@ -14,7 +14,6 @@
"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 7873203..708cf43 100644
--- a/tests/foo/1.0/default/lib/Android.bp
+++ b/tests/foo/1.0/default/lib/Android.bp
@@ -7,7 +7,6 @@
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 090c36e..a67dc09 100644
--- a/tests/inheritance/1.0/default/Android.bp
+++ b/tests/inheritance/1.0/default/Android.bp
@@ -14,7 +14,6 @@
"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 0edabfc..6e8fbb1 100644
--- a/tests/libhwbinder/1.0/default/Android.bp
+++ b/tests/libhwbinder/1.0/default/Android.bp
@@ -10,7 +10,6 @@
"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 14dc08d..40716da 100644
--- a/tests/memory/1.0/default/Android.bp
+++ b/tests/memory/1.0/default/Android.bp
@@ -22,7 +22,6 @@
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 ab7f8fa..c4dc013 100644
--- a/tests/pointer/1.0/default/Android.bp
+++ b/tests/pointer/1.0/default/Android.bp
@@ -14,7 +14,6 @@
"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 a7203c7..7737932 100644
--- a/tests/pointer/1.0/default/lib/Android.bp
+++ b/tests/pointer/1.0/default/lib/Android.bp
@@ -8,7 +8,6 @@
"libbase",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"liblog",
"android.hardware.tests.pointer@1.0",
],
diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp
index 96f69cc..0b068e7 100644
--- a/thermal/1.0/default/Android.bp
+++ b/thermal/1.0/default/Android.bp
@@ -7,7 +7,6 @@
"liblog",
"libcutils",
"libhardware",
- "libhwbinder",
"libbase",
"libcutils",
"libutils",
diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk
index 72c46af..2d25dc3 100644
--- a/thermal/1.0/default/Android.mk
+++ b/thermal/1.0/default/Android.mk
@@ -33,7 +33,6 @@
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 92f8c49..63f0ba9 100644
--- a/thermal/1.0/vts/functional/Android.bp
+++ b/thermal/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"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 3f986e6..9d37344 100644
--- a/tv/cec/1.0/default/Android.mk
+++ b/tv/cec/1.0/default/Android.mk
@@ -10,7 +10,6 @@
LOCAL_SHARED_LIBRARIES := \
libhidlbase \
libhidltransport \
- libhwbinder \
liblog \
libbase \
libutils \
@@ -38,7 +37,6 @@
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 be1775d..210da86 100644
--- a/tv/input/1.0/default/Android.mk
+++ b/tv/input/1.0/default/Android.mk
@@ -13,7 +13,6 @@
libhardware \
libhidlbase \
libhidltransport \
- libhwbinder \
libutils \
android.hardware.audio.common@2.0 \
android.hardware.tv.input@1.0 \
@@ -38,7 +37,6 @@
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 b93111d..e3785ab 100644
--- a/tv/input/1.0/vts/functional/Android.bp
+++ b/tv/input/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"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 489293c..afd53cf 100644
--- a/usb/1.0/default/Android.mk
+++ b/usb/1.0/default/Android.mk
@@ -14,7 +14,6 @@
libhidlbase \
libhidltransport \
liblog \
- libhwbinder \
libutils \
libhardware \
android.hardware.usb@1.0 \
diff --git a/usb/1.0/default/Usb.cpp b/usb/1.0/default/Usb.cpp
index f46ff66..6eb8842 100644
--- a/usb/1.0/default/Usb.cpp
+++ b/usb/1.0/default/Usb.cpp
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <assert.h>
#include <dirent.h>
#include <iostream>
#include <fstream>
@@ -34,6 +35,9 @@
namespace V1_0 {
namespace implementation {
+// Set by the signal handler to destroy the thread
+volatile bool destroyThread;
+
int32_t readFile(std::string filename, std::string& contents) {
std::ifstream file(filename);
@@ -172,17 +176,22 @@
ports++;
}
}
+
+ if (ports == 0) {
+ closedir(dp);
+ return Status::SUCCESS;
+ }
+
names.resize(ports);
rewinddir(dp);
while ((ep = readdir (dp))) {
- /* Check to see if new ports were added since the first pass. */
- if (current >= ports) {
- rewinddir(dp);
- goto rescan;
- }
-
if (ep->d_type == DT_LNK) {
+ /* Check to see if new ports were added since the first pass. */
+ if (current >= ports) {
+ rewinddir(dp);
+ goto rescan;
+ }
names[current++] = ep->d_name;
}
}
@@ -234,7 +243,7 @@
if (result == Status::SUCCESS) {
currentPortStatus.resize(names.size());
- for(std::vector<std::string>::size_type i = 0; i != names.size(); i++) {
+ for(std::vector<std::string>::size_type i = 0; i < names.size(); i++) {
ALOGI("%s", names[i].c_str());
currentPortStatus[i].portName = names[i];
@@ -374,7 +383,7 @@
goto error;
}
- while (1) {
+ while (!destroyThread) {
struct epoll_event events[64];
nevents = epoll_wait(epoll_fd, events, 64, -1);
@@ -392,6 +401,7 @@
}
}
+ ALOGI("exiting worker thread");
error:
close(uevent_fd);
@@ -401,26 +411,61 @@
return NULL;
}
+void sighandler(int sig)
+{
+ if (sig == SIGUSR1) {
+ destroyThread = true;
+ ALOGI("destroy set");
+ return;
+ }
+ signal(SIGUSR1, sighandler);
+}
Return<void> Usb::setCallback(const sp<IUsbCallback>& callback) {
- if (mCallback != NULL) {
- ALOGE("Callback already registered");
+ pthread_mutex_lock(&mLock);
+ if ((mCallback == NULL && callback == NULL) ||
+ (mCallback != NULL && callback != NULL)) {
+ mCallback = callback;
+ pthread_mutex_unlock(&mLock);
return Void();
}
mCallback = callback;
ALOGI("registering callback");
- if (pthread_create(&mPoll, NULL, work, this)) {
- ALOGE("pthread creation failed %d", errno);
- mCallback = NULL;
+ if (mCallback == NULL) {
+ if (!pthread_kill(mPoll, SIGUSR1)) {
+ pthread_join(mPoll, NULL);
+ ALOGI("pthread destroyed");
+ }
+ pthread_mutex_unlock(&mLock);
return Void();
}
+ destroyThread = false;
+ signal(SIGUSR1, sighandler);
+
+ if (pthread_create(&mPoll, NULL, work, this)) {
+ ALOGE("pthread creation failed %d", errno);
+ mCallback = NULL;
+ }
+ pthread_mutex_unlock(&mLock);
return Void();
}
+// Protects *usb assignment
+pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+Usb *usb;
+
+Usb::Usb() {
+ pthread_mutex_lock(&lock);
+ // Make this a singleton class
+ assert(usb == NULL);
+ usb = this;
+ pthread_mutex_unlock(&lock);
+}
+
} // namespace implementation
} // namespace V1_0
} // namespace usb
diff --git a/usb/1.0/default/Usb.h b/usb/1.0/default/Usb.h
index cf418f4..c34d080 100644
--- a/usb/1.0/default/Usb.h
+++ b/usb/1.0/default/Usb.h
@@ -32,6 +32,7 @@
using ::android::sp;
struct Usb : public IUsb {
+ Usb();
Return<void> switchRole(const hidl_string& portName, const PortRole& role) override;
Return<void> setCallback(const sp<IUsbCallback>& callback) override;
Return<void> queryPortStatus() override;
@@ -39,6 +40,7 @@
sp<IUsbCallback> mCallback;
private:
pthread_t mPoll;
+ pthread_mutex_t mLock = PTHREAD_MUTEX_INITIALIZER;
};
} // namespace implementation
diff --git a/usb/1.0/vts/functional/Android.bp b/usb/1.0/vts/functional/Android.bp
index de11a8c..6f3d1be 100644
--- a/usb/1.0/vts/functional/Android.bp
+++ b/usb/1.0/vts/functional/Android.bp
@@ -24,7 +24,6 @@
"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 6cb9802..3bd317f 100644
--- a/vibrator/1.0/default/Android.bp
+++ b/vibrator/1.0/default/Android.bp
@@ -22,7 +22,6 @@
"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 091d615..af4a955 100644
--- a/vibrator/1.0/default/Android.mk
+++ b/vibrator/1.0/default/Android.mk
@@ -28,7 +28,6 @@
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 0d374d3..e7afa9a 100644
--- a/vr/1.0/default/Android.bp
+++ b/vr/1.0/default/Android.bp
@@ -7,7 +7,6 @@
"liblog",
"libcutils",
"libhardware",
- "libhwbinder",
"libbase",
"libcutils",
"libutils",
@@ -30,7 +29,6 @@
"libhardware",
"libhidlbase",
"libhidltransport",
- "libhwbinder",
"android.hardware.vr@1.0",
],
}
diff --git a/vr/1.0/default/Vr.cpp b/vr/1.0/default/Vr.cpp
index a0de998..345db99 100644
--- a/vr/1.0/default/Vr.cpp
+++ b/vr/1.0/default/Vr.cpp
@@ -42,16 +42,16 @@
return Void();
}
-IVr* HIDL_FETCH_IVr(const char *name) {
+IVr* HIDL_FETCH_IVr(const char * /*name*/) {
vr_module_t *vr_module;
const hw_module_t *hw_module = NULL;
- int ret = hw_get_module(name, &hw_module);
+ int ret = hw_get_module(VR_HARDWARE_MODULE_ID, &hw_module);
if (ret == 0) {
return new Vr(reinterpret_cast<vr_module_t*>(
const_cast<hw_module_t*>(hw_module)));
} else {
- ALOGE("hw_get_module %s failed: %d", name, ret);
+ ALOGE("hw_get_module %s failed: %d", VR_HARDWARE_MODULE_ID, ret);
return nullptr;
}
}
diff --git a/vr/1.0/default/service.cpp b/vr/1.0/default/service.cpp
index c27ceaf..22fb7d1 100644
--- a/vr/1.0/default/service.cpp
+++ b/vr/1.0/default/service.cpp
@@ -23,5 +23,5 @@
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<IVr>("vr");
+ return defaultPassthroughServiceImplementation<IVr>();
}
diff --git a/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp b/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp
index 29888fd..c7ec076 100644
--- a/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp
+++ b/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp
@@ -26,13 +26,11 @@
using ::android::hardware::Void;
using ::android::sp;
-#define VR_SERVICE_NAME "vr"
-
// The main test class for VR HIDL HAL.
class VrHidlTest : public ::testing::Test {
public:
void SetUp() override {
- vr = IVr::getService(VR_SERVICE_NAME);
+ vr = IVr::getService();
ASSERT_NE(vr, nullptr);
}
diff --git a/wifi/1.0/default/Android.mk b/wifi/1.0/default/Android.mk
index 2d2d898..00e5f98 100644
--- a/wifi/1.0/default/Android.mk
+++ b/wifi/1.0/default/Android.mk
@@ -39,7 +39,6 @@
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 01eeef5..dc36139 100644
--- a/wifi/1.0/vts/functional/Android.bp
+++ b/wifi/1.0/vts/functional/Android.bp
@@ -34,7 +34,6 @@
"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 52fecc2..5d7c763 100644
--- a/wifi/supplicant/1.0/vts/functional/Android.mk
+++ b/wifi/supplicant/1.0/vts/functional/Android.mk
@@ -31,7 +31,6 @@
libcutils \
libhidlbase \
libhidltransport \
- libhwbinder \
liblog \
libutils \
libwifi-hal \