Fix VTS paths on 32-bit target am: dd716c36f2 am: 93eda4d82a

am: 8d2edad108

Change-Id: I6c8c0635fc4cde2656f101d7bd61bd9fcb79c9f9
This commit is contained in:
Hsin-Yi Chen 2017-01-12 23:28:33 +00:00 committed by android-build-merger
commit eff0aadfba
2 changed files with 10 additions and 8 deletions

View file

@ -47,12 +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",
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."""

View file

@ -44,11 +44,11 @@ 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",
bits=64)
bits=64 if self.dut.is64Bit else 32)
def tearDownClass(self):
""" If profiling is enabled for the test, collect the profiling data