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

Commit 3f9fdc74 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix VTS paths on 32-bit target"

parents 93a89674 23bd70d5

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

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

        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)

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



    def tearDownClass(self):

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

sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py

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

tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py

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

        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)

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



    def testGetCecVersion1(self):

        """A simple test case which queries the cec version."""

vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py

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

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

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