Snap for 11361184 from 04c241de6af1d808c3a9c48a61c00c904ea77073 to 24Q2-release

Change-Id: If16ee2e55a638fe0e64ba884811626d397a9425f

3 files changed, 23 insertions, 21 deletions

diff --git a/abi/vts_vndk_abi_test.py b/abi/vts_vndk_abi_test.py
index a73a23f..b085dfb 100644
--- a/abi/vts_vndk_abi_test.py
+++ b/abi/vts_vndk_abi_test.py
@@ -307,6 +307,10 @@ class VtsVndkAbiTest(unittest.TestCase):
         Args:
             bitness: 32 or 64, the bitness of the tested libraries.
         """
+        if not self._dut.GetCpuAbiList(bitness):
+            logging.info("Skip the test as the device doesn't support %d-bit "
+                         "ABI.", bitness)
+            return
         if not vndk_utils.IsVndkRequired(self._dut):
             logging.info("Skip the test as the device does not require VNDK.")
             return
@@ -360,11 +364,7 @@ class VtsVndkAbiTest(unittest.TestCase):
 
     def testAbiCompatibility64(self):
         """Checks ABI compliance of 64-bit VNDK libraries."""
-        if self._dut.GetCpuAbiList(64):
-            self._TestAbiCompatibility(64)
-        else:
-            logging.info("Skip the test as the device doesn't support 64-bit "
-                         "ABI.")
+        self._TestAbiCompatibility(64)
 
 
 if __name__ == "__main__":
diff --git a/dependency/vts_vndk_dependency_test.py b/dependency/vts_vndk_dependency_test.py
index 66ad6c1..1fc503f 100644
--- a/dependency/vts_vndk_dependency_test.py
+++ b/dependency/vts_vndk_dependency_test.py
@@ -450,7 +450,9 @@ class VtsVndkDependencyTest(unittest.TestCase):
                 target_dir, abi_list,
                 lambda p, e: read_errors.append((p, str(e))))
 
-        dep_errors = self._TestElfDependency(32, objs)
+        dep_errors = []
+        if self._dut.GetCpuAbiList(32):
+            dep_errors.extend(self._TestElfDependency(32, objs))
         if self._dut.GetCpuAbiList(64):
             dep_errors.extend(self._TestElfDependency(64, objs))
 
diff --git a/files/vts_vndk_files_test.py b/files/vts_vndk_files_test.py
index 9c1510f..f9c76cd 100644
--- a/files/vts_vndk_files_test.py
+++ b/files/vts_vndk_files_test.py
@@ -122,6 +122,10 @@ class VtsVndkFilesTest(unittest.TestCase):
 
     def _TestVndkCoreDirectory(self, bitness):
         """Verifies that VNDK directory doesn't contain extra files."""
+        if not self._dut.GetCpuAbiList(bitness):
+            logging.info("Skip the test as the device doesn't support %d-bit "
+                         "ABI.", bitness)
+            return
         if not vndk_utils.IsVndkRuntimeEnforced(self._dut):
             logging.info("Skip the test as VNDK runtime is not enforced on "
                          "the device.")
@@ -144,14 +148,14 @@ class VtsVndkFilesTest(unittest.TestCase):
 
     def testVndkCoreDirectory64(self):
         """Runs _TestVndkCoreDirectory for 64-bit libraries."""
-        if self._dut.GetCpuAbiList(64):
-            self._TestVndkCoreDirectory(64)
-        else:
-            logging.info("Skip the test as the device doesn't support 64-bit "
-                         "ABI.")
+        self._TestVndkCoreDirectory(64)
 
     def _TestNoLlndkInVendor(self, bitness):
         """Verifies that vendor partition has no LL-NDK libraries."""
+        if not self._dut.GetCpuAbiList(bitness):
+            logging.info("Skip the test as the device doesn't support %d-bit "
+                         "ABI.", bitness)
+            return
         self._TestNoLlndkInDirectory(
             vndk_utils.FormatVndkPath(self._TARGET_VENDOR_LIB, bitness))
 
@@ -161,14 +165,14 @@ class VtsVndkFilesTest(unittest.TestCase):
 
     def testNoLlndkInVendor64(self):
         """Runs _TestNoLlndkInVendor for 64-bit libraries."""
-        if self._dut.GetCpuAbiList(64):
-            self._TestNoLlndkInVendor(64)
-        else:
-            logging.info("Skip the test as the device doesn't support 64-bit "
-                         "ABI.")
+        self._TestNoLlndkInVendor(64)
 
     def _TestNoLlndkInOdm(self, bitness):
         """Verifies that odm partition has no LL-NDK libraries."""
+        if not self._dut.GetCpuAbiList(bitness):
+            logging.info("Skip the test as the device doesn't support %d-bit "
+                         "ABI.", bitness)
+            return
         self._TestNoLlndkInDirectory(
             vndk_utils.FormatVndkPath(self._TARGET_ODM_LIB, bitness))
 
@@ -178,11 +182,7 @@ class VtsVndkFilesTest(unittest.TestCase):
 
     def testNoLlndkInOdm64(self):
         """Runs _TestNoLlndkInOdm for 64-bit libraries."""
-        if self._dut.GetCpuAbiList(64):
-            self._TestNoLlndkInOdm(64)
-        else:
-            logging.info("Skip the test as the device doesn't support 64-bit "
-                         "ABI.")
+        self._TestNoLlndkInOdm(64)
 
 
 if __name__ == "__main__":