mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:50:18 +00:00
Fix VTS paths on 32-bit target
Decide target_basepaths by device's bitness. On 32-bit target, do not include */lib64. Bug: 33930594 Test: vts-tradefed run commandAndExit vts -m VibratorHidlTest -l INFO Change-Id: I340ded1d763dc194da461ecf183c6a2ff5f5ee6f
This commit is contained in:
@@ -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."""
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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."""
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user