diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py index 136704a248..de01f4352e 100644 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py +++ b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py @@ -47,13 +47,14 @@ class NfcHidlBasicTest(base_test_with_webdb.BaseTestWithWebDbClass): self.dut.shell.one.Execute( "setprop vts.hal.vts.hidl.get_stub false") - self.dut.hal.InitHidlHal(target_type="nfc", - target_basepaths=["/system/lib64"], - target_version=1.0, - target_package="android.hardware.nfc", - target_component_name="INfc", - hw_binder_service_name="nfc_nci", - bits=64) + self.dut.hal.InitHidlHal( + target_type="nfc", + target_basepaths=self.dut.libPaths, + target_version=1.0, + target_package="android.hardware.nfc", + target_component_name="INfc", + hw_binder_service_name="nfc_nci", + bits=64 if self.dut.is64Bit else 32) def tearDownClass(self): """Turns off the framework-layer NFC service.""" diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py index 88fe675a3d..de764afa83 100644 --- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py +++ b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py @@ -48,11 +48,11 @@ class SensorsHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): self.dut.hal.InitHidlHal( target_type="sensors", - target_basepaths=["/system/lib64"], + target_basepaths=self.dut.libPaths, target_version=1.0, target_package="android.hardware.sensors", target_component_name="ISensors", - bits=64) + bits=64 if self.dut.is64Bit else 32) def tearDownClass(self): """ If profiling is enabled for the test, collect the profiling data diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py index cd2374adb7..dcf21c94d3 100644 --- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py +++ b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py @@ -37,13 +37,14 @@ class TvCecHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): self.dut.shell.one.Execute( "setprop vts.hal.vts.hidl.get_stub true") - self.dut.hal.InitHidlHal(target_type="tv_cec", - target_basepaths=["/system/lib64"], - target_version=1.0, - target_package="android.hardware.tv.cec", - target_component_name="IHdmiCec", - hw_binder_service_name="tv.cec", - bits=64) + self.dut.hal.InitHidlHal( + target_type="tv_cec", + target_basepaths=self.dut.libPaths, + target_version=1.0, + target_package="android.hardware.tv.cec", + target_component_name="IHdmiCec", + hw_binder_service_name="tv.cec", + bits=64 if self.dut.is64Bit else 32) def testGetCecVersion1(self): """A simple test case which queries the cec version.""" diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py index 37f24c4793..e17c72d707 100644 --- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py +++ b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py @@ -40,12 +40,12 @@ class VehicleHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): self.dut.hal.InitHidlHal( target_type="vehicle", - target_basepaths=["/system/lib64"], + target_basepaths=self.dut.libPaths, target_version=2.0, target_package="android.hardware.vehicle", target_component_name="IVehicle", hw_binder_service_name="Vehicle", - bits=64) + bits=64 if self.dut.is64Bit else 32) def tearDownClass(self): """ If profiling is enabled for the test, collect the profiling data diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py index b36f47ab46..da70474e42 100644 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py +++ b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py @@ -44,12 +44,12 @@ class VibratorHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): self.dut.hal.InitHidlHal( target_type="vibrator", - target_basepaths=["/system/lib64"], + target_basepaths=self.dut.libPaths, target_version=1.0, target_package="android.hardware.vibrator", target_component_name="IVibrator", hw_binder_service_name="vibrator", - bits=64) + bits=64 if self.dut.is64Bit else 32) def tearDownClass(self): """ If profiling is enabled for the test, collect the profiling data