Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd716c36 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by Ruchi Kandoi
Browse files

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
(cherry picked from commit 23bd70d5)
parent b4b3c93e

nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py

+8 −6
Original line number Diff line number Diff line
@@ -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"],

        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",

                                 bits=64)

            hw_binder_service_name="nfc_nci",

            bits=64 if self.dut.is64Bit else 32)



    def tearDownClass(self):

        """Turns off the framework-layer NFC service."""

vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py

+2 −2
Original line number Diff line number Diff line
@@ -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