Merge "vndk-def: Fix 32-bit directory layout regression"

vndk/tools/definition-tool/tests/test_vndk_lib_dir.py

@@ -168,6 +168,17 @@ class VNDKLibDirTest(unittest.TestCase):
         self.assertIn('29', vndk_lib_dirs)
 
 
+    def test_create_from_dirs_versioned_32bit_only(self):
+        input_dir = os.path.join(
+                SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir', 'vndk_32')
+
+        vndk_lib_dirs = VNDKLibDir.create_from_dirs(
+                [os.path.join(input_dir, 'system')],
+                [os.path.join(input_dir, 'vendor')])
+
+        self.assertIn('28', vndk_lib_dirs)
+
+
     def test_get_property(self):
         property_file = StringIO('ro.vndk.version=example\n')
         ans = VNDKLibDir._get_property(property_file, 'ro.vndk.version')

vndk/tools/definition-tool/vndk_definition_tool.py

@@ -1018,10 +1018,13 @@ class VNDKLibDir(list):
             for base_dir in base_dirs:
                 for lib_dir in ('lib', 'lib64'):
                     lib_dir_path = os.path.join(base_dir, lib_dir)
-                    for name in os.listdir(lib_dir_path):
-                        version = cls.extract_version_from_name(name)
-                        if version:
-                            versions.add(version)
+                    try:
+                        for name in os.listdir(lib_dir_path):
+                            version = cls.extract_version_from_name(name)
+                            if version:
+                                versions.add(version)
+                    except FileNotFoundError:
+                        pass
             return versions
 
         versions = set()