vndk-def: Fix spacing errors found by pylint
This commit fixes several spacing errors (e.g. indention,
and space-after-comma) that are found by pylint.
Test: ./tests/run.py
Change-Id: I830a9cddc91e21421b16c2a1d1a101c0beb7af62
diff --git a/vndk/tools/definition-tool/tests/ndk_toolchain.py b/vndk/tools/definition-tool/tests/ndk_toolchain.py
index 485b1b8..3411e4c 100755
--- a/vndk/tools/definition-tool/tests/ndk_toolchain.py
+++ b/vndk/tools/definition-tool/tests/ndk_toolchain.py
@@ -87,7 +87,7 @@
return False
ld_exeutable = os.path.join(
- self.gcc_toolchain_dir, 'bin', self.target_triple + '-ld')
+ self.gcc_toolchain_dir, 'bin', self.target_triple + '-ld')
success = check_path(self.gcc_toolchain_dir)
success &= check_path(ld_exeutable)
@@ -146,55 +146,55 @@
targets = collections.OrderedDict()
targets['arm'] = Target(
- 'arm', 'arm-linux-androideabi', [],[],
- get_gcc_dir(ndk_dir, 'arm-linux-androideabi-4.9', host),
- get_clang_dir(ndk_dir, host),
- get_platform_dir(ndk_dir, api, ['arch-arm', 'usr', 'include']),
- get_platform_dir(ndk_dir, api, ['arch-arm', 'usr', 'lib']))
+ 'arm', 'arm-linux-androideabi', [], [],
+ get_gcc_dir(ndk_dir, 'arm-linux-androideabi-4.9', host),
+ get_clang_dir(ndk_dir, host),
+ get_platform_dir(ndk_dir, api, ['arch-arm', 'usr', 'include']),
+ get_platform_dir(ndk_dir, api, ['arch-arm', 'usr', 'lib']))
targets['arm64'] = Target(
- 'arm64', 'aarch64-linux-android', [], [],
- get_gcc_dir(ndk_dir, 'aarch64-linux-android-4.9', host),
- get_clang_dir(ndk_dir, host),
- get_platform_dir(ndk_dir, api, ['arch-arm64', 'usr', 'include']),
- get_platform_dir(ndk_dir, api, ['arch-arm64', 'usr', 'lib']))
+ 'arm64', 'aarch64-linux-android', [], [],
+ get_gcc_dir(ndk_dir, 'aarch64-linux-android-4.9', host),
+ get_clang_dir(ndk_dir, host),
+ get_platform_dir(ndk_dir, api, ['arch-arm64', 'usr', 'include']),
+ get_platform_dir(ndk_dir, api, ['arch-arm64', 'usr', 'lib']))
targets['x86'] = Target(
- 'x86', 'i686-linux-android', ['-m32'], ['-m32'],
- get_gcc_dir(ndk_dir, 'x86-4.9', host),
- get_clang_dir(ndk_dir, host),
- get_platform_dir(ndk_dir, api, ['arch-x86', 'usr', 'include']),
- get_platform_dir(ndk_dir, api, ['arch-x86', 'usr', 'lib']))
+ 'x86', 'i686-linux-android', ['-m32'], ['-m32'],
+ get_gcc_dir(ndk_dir, 'x86-4.9', host),
+ get_clang_dir(ndk_dir, host),
+ get_platform_dir(ndk_dir, api, ['arch-x86', 'usr', 'include']),
+ get_platform_dir(ndk_dir, api, ['arch-x86', 'usr', 'lib']))
targets['x86_64'] = Target(
- 'x86_64', 'x86_64-linux-android', ['-m64'], ['-m64'],
- get_gcc_dir(ndk_dir, 'x86_64-4.9', host),
- get_clang_dir(ndk_dir, host),
- get_platform_dir(ndk_dir, api, ['arch-x86_64', 'usr', 'include']),
- get_platform_dir(ndk_dir, api, ['arch-x86_64', 'usr', 'lib64']))
+ 'x86_64', 'x86_64-linux-android', ['-m64'], ['-m64'],
+ get_gcc_dir(ndk_dir, 'x86_64-4.9', host),
+ get_clang_dir(ndk_dir, host),
+ get_platform_dir(ndk_dir, api, ['arch-x86_64', 'usr', 'include']),
+ get_platform_dir(ndk_dir, api, ['arch-x86_64', 'usr', 'lib64']))
targets['mips'] = Target(
- 'mips', 'mipsel-linux-android', [], [],
- get_gcc_dir(ndk_dir, 'mipsel-linux-android-4.9', host),
- get_clang_dir(ndk_dir, host),
- get_platform_dir(ndk_dir, api, ['arch-mips', 'usr', 'include']),
- get_platform_dir(ndk_dir, api, ['arch-mips', 'usr', 'lib']))
+ 'mips', 'mipsel-linux-android', [], [],
+ get_gcc_dir(ndk_dir, 'mipsel-linux-android-4.9', host),
+ get_clang_dir(ndk_dir, host),
+ get_platform_dir(ndk_dir, api, ['arch-mips', 'usr', 'include']),
+ get_platform_dir(ndk_dir, api, ['arch-mips', 'usr', 'lib']))
targets['mips64'] = Target(
- 'mips64', 'mips64el-linux-android',
- ['-march=mips64el', '-mcpu=mips64r6'],
- ['-march=mips64el', '-mcpu=mips64r6'],
- get_gcc_dir(ndk_dir, 'mips64el-linux-android-4.9', host),
- get_clang_dir(ndk_dir, host),
- get_platform_dir(ndk_dir, api, ['arch-mips64', 'usr', 'include']),
- get_platform_dir(ndk_dir, api, ['arch-mips64', 'usr', 'lib64']))
+ 'mips64', 'mips64el-linux-android',
+ ['-march=mips64el', '-mcpu=mips64r6'],
+ ['-march=mips64el', '-mcpu=mips64r6'],
+ get_gcc_dir(ndk_dir, 'mips64el-linux-android-4.9', host),
+ get_clang_dir(ndk_dir, host),
+ get_platform_dir(ndk_dir, api, ['arch-mips64', 'usr', 'include']),
+ get_platform_dir(ndk_dir, api, ['arch-mips64', 'usr', 'lib64']))
return targets
def main():
parser = argparse.ArgumentParser(
- description='Dry-run NDK toolchain detection')
+ description='Dry-run NDK toolchain detection')
parser.add_argument('--ndk-dir')
parser.add_argument('--api-level')
parser.add_argument('--host')
diff --git a/vndk/tools/definition-tool/tests/test_command_deps_insight.py b/vndk/tools/definition-tool/tests/test_command_deps_insight.py
index d0b0bb1..7777826 100755
--- a/vndk/tools/definition-tool/tests/test_command_deps_insight.py
+++ b/vndk/tools/definition-tool/tests/test_command_deps_insight.py
@@ -71,7 +71,7 @@
self.assertNotIn(libvnd_bad, libvndk_sp.deps_good)
strs, mods = DepsInsightCommand.serialize_data(
- list(gb.graph.all_libs()), vndk_sets, ModuleInfo())
+ list(gb.graph.all_libs()), vndk_sets, ModuleInfo())
deps = self._get_module_deps(strs, mods, libvndk.path)
self.assertIn(libvnd_bad.path, deps)
diff --git a/vndk/tools/definition-tool/tests/test_elf_linker.py b/vndk/tools/definition-tool/tests/test_elf_linker.py
index 01038a0..52f4a91 100755
--- a/vndk/tools/definition-tool/tests/test_elf_linker.py
+++ b/vndk/tools/definition-tool/tests/test_elf_linker.py
@@ -393,36 +393,36 @@
libc_32, libc_64 = gb.add_multilib(PT_SYSTEM, 'libc')
libvndk_a_32, libvndk_a_64 = gb.add_multilib(
- PT_SYSTEM, 'libvndk_a', extra_dir='vndk-28',
- dt_needed=['libc.so', 'libvndk_b.so', 'libvndk_sp_b.so'])
+ PT_SYSTEM, 'libvndk_a', extra_dir='vndk-28',
+ dt_needed=['libc.so', 'libvndk_b.so', 'libvndk_sp_b.so'])
libvndk_b_32, libvndk_b_64 = gb.add_multilib(
- PT_SYSTEM, 'libvndk_b', extra_dir='vndk-28',
- dt_needed=['libc.so', 'libvndk_sp_b.so'])
+ PT_SYSTEM, 'libvndk_b', extra_dir='vndk-28',
+ dt_needed=['libc.so', 'libvndk_sp_b.so'])
libvndk_c_32, libvndk_c_64 = gb.add_multilib(
- PT_VENDOR, 'libvndk_c', extra_dir='vndk-28',
- dt_needed=['libc.so', 'libvndk_d.so', 'libvndk_sp_d.so'])
+ PT_VENDOR, 'libvndk_c', extra_dir='vndk-28',
+ dt_needed=['libc.so', 'libvndk_d.so', 'libvndk_sp_d.so'])
libvndk_d_32, libvndk_d_64 = gb.add_multilib(
- PT_VENDOR, 'libvndk_d', extra_dir='vndk-28',
- dt_needed=['libc.so', 'libvndk_sp_d.so'])
+ PT_VENDOR, 'libvndk_d', extra_dir='vndk-28',
+ dt_needed=['libc.so', 'libvndk_sp_d.so'])
libvndk_sp_a_32, libvndk_sp_a_64 = gb.add_multilib(
- PT_SYSTEM, 'libvndk_sp_a', extra_dir='vndk-sp-28',
- dt_needed=['libc.so', 'libvndk_sp_b.so'])
+ PT_SYSTEM, 'libvndk_sp_a', extra_dir='vndk-sp-28',
+ dt_needed=['libc.so', 'libvndk_sp_b.so'])
libvndk_sp_b_32, libvndk_sp_b_64 = gb.add_multilib(
- PT_SYSTEM, 'libvndk_sp_b', extra_dir='vndk-sp-28',
- dt_needed=['libc.so'])
+ PT_SYSTEM, 'libvndk_sp_b', extra_dir='vndk-sp-28',
+ dt_needed=['libc.so'])
libvndk_sp_c_32, libvndk_sp_c_64 = gb.add_multilib(
- PT_VENDOR, 'libvndk_sp_c', extra_dir='vndk-sp-28',
- dt_needed=['libc.so', 'libvndk_sp_d.so'])
+ PT_VENDOR, 'libvndk_sp_c', extra_dir='vndk-sp-28',
+ dt_needed=['libc.so', 'libvndk_sp_d.so'])
libvndk_sp_d_32, libvndk_sp_d_64 = gb.add_multilib(
- PT_VENDOR, 'libvndk_sp_d', extra_dir='vndk-sp-28',
- dt_needed=['libc.so'])
+ PT_VENDOR, 'libvndk_sp_d', extra_dir='vndk-sp-28',
+ dt_needed=['libc.so'])
gb.resolve(VNDKLibDir.create_from_version('28'), '28')
@@ -561,9 +561,9 @@
gb.graph.add_dlopen_deps(tmp_file.name)
self.assertRegexpMatches(
- stderr.getvalue(),
- 'error:' + re.escape(tmp_file.name) + ':1: ' +
- 'Failed to add dlopen dependency from .* to .*\\.\n')
+ stderr.getvalue(),
+ 'error:' + re.escape(tmp_file.name) + ':1: ' +
+ 'Failed to add dlopen dependency from .* to .*\\.\n')
if __name__ == '__main__':
diff --git a/vndk/tools/definition-tool/tests/test_elf_resolver.py b/vndk/tools/definition-tool/tests/test_elf_resolver.py
index 30bab9f..9ca0fd5 100755
--- a/vndk/tools/definition-tool/tests/test_elf_resolver.py
+++ b/vndk/tools/definition-tool/tests/test_elf_resolver.py
@@ -30,46 +30,46 @@
r = self.resolver
self.assertEqual(
- ['/system/lib/libx.so', '/vendor/lib/libx.so'],
- list(r.get_candidates('/system/lib/libreq.so', 'libx.so')))
+ ['/system/lib/libx.so', '/vendor/lib/libx.so'],
+ list(r.get_candidates('/system/lib/libreq.so', 'libx.so')))
self.assertEqual(
- ['/C/libx.so', '/system/lib/libx.so', '/vendor/lib/libx.so'],
- list(r.get_candidates('/system/lib/libreq.so', 'libx.so',
- ['/C'])))
+ ['/C/libx.so', '/system/lib/libx.so', '/vendor/lib/libx.so'],
+ list(r.get_candidates('/system/lib/libreq.so', 'libx.so', ['/C'])))
self.assertEqual(
- ['/C/libx.so', '/D/libx.so', '/system/lib/libx.so',
- '/vendor/lib/libx.so'],
- list(r.get_candidates('/system/lib/libreq.so', 'libx.so',
- ['/C', '/D'])))
+ ['/C/libx.so', '/D/libx.so', '/system/lib/libx.so',
+ '/vendor/lib/libx.so'],
+ list(r.get_candidates('/system/lib/libreq.so', 'libx.so',
+ ['/C', '/D'])))
self.assertEqual(
- ['/E/libx.so', '/system/lib/libx.so', '/vendor/lib/libx.so'],
- list(r.get_candidates('/system/lib/libreq.so', 'libx.so', None,
- ['/E'])))
+ ['/E/libx.so', '/system/lib/libx.so', '/vendor/lib/libx.so'],
+ list(r.get_candidates('/system/lib/libreq.so', 'libx.so', None,
+ ['/E'])))
self.assertEqual(
- ['/E/libx.so', '/F/libx.so', '/system/lib/libx.so',
- '/vendor/lib/libx.so'],
- list(r.get_candidates('/system/lib/libreq.so', 'libx.so', None,
- ['/E', '/F'])))
+ ['/E/libx.so', '/F/libx.so', '/system/lib/libx.so',
+ '/vendor/lib/libx.so'],
+ list(r.get_candidates('/system/lib/libreq.so', 'libx.so', None,
+ ['/E', '/F'])))
self.assertEqual(
- ['/C/libx.so', '/D/libx.so', '/E/libx.so', '/F/libx.so',
- '/system/lib/libx.so', '/vendor/lib/libx.so'],
- list(r.get_candidates('/system/lib/libreq.so', 'libx.so',
- ['/C', '/D'], ['/E', '/F'])))
+ ['/C/libx.so', '/D/libx.so', '/E/libx.so', '/F/libx.so',
+ '/system/lib/libx.so', '/vendor/lib/libx.so'],
+ list(r.get_candidates('/system/lib/libreq.so', 'libx.so',
+ ['/C', '/D'], ['/E', '/F'])))
# Test app-specific search paths.
self.assertEqual(
- ['/system/app/example/lib/armeabi-v7a/libx.so',
- '/C/libx.so', '/D/libx.so', '/E/libx.so', '/F/libx.so',
- '/system/lib/libx.so', '/vendor/lib/libx.so'],
- list(r.get_candidates(
- '/system/app/example/lib/armeabi-v7a/libreq.so',
- 'libx.so',
- ['/C', '/D'], ['/E', '/F'])))
+ ['/system/app/example/lib/armeabi-v7a/libx.so',
+ '/C/libx.so', '/D/libx.so', '/E/libx.so', '/F/libx.so',
+ '/system/lib/libx.so', '/vendor/lib/libx.so'],
+ list(r.get_candidates(
+ '/system/app/example/lib/armeabi-v7a/libreq.so',
+ 'libx.so',
+ ['/C', '/D'], ['/E', '/F'])))
+
def test_resolve(self):
r = self.resolver
@@ -78,22 +78,22 @@
self.assertEqual(None, r.resolve('/system/lib/libreq.so', 'libe.so'))
self.assertEqual(
- 'e',
- r.resolve('/system/lib/libreq.so', 'libe.so',
- dt_rpath=['/system/lib/hw']))
+ 'e',
+ r.resolve('/system/lib/libreq.so', 'libe.so',
+ dt_rpath=['/system/lib/hw']))
self.assertEqual(
- 'e',
- r.resolve('/system/lib/libreq.so', 'libe.so',
- dt_runpath=['/system/lib/hw']))
+ 'e',
+ r.resolve('/system/lib/libreq.so', 'libe.so',
+ dt_runpath=['/system/lib/hw']))
self.assertEqual(
- 'a2',
- r.resolve('/system/lib/libreq.so', 'liba.so',
- dt_rpath=['/vendor/lib']))
+ 'a2',
+ r.resolve('/system/lib/libreq.so', 'liba.so',
+ dt_rpath=['/vendor/lib']))
self.assertEqual(
- 'a2',
- r.resolve('/system/lib/libreq.so', 'liba.so',
- dt_runpath=['/vendor/lib']))
+ 'a2',
+ r.resolve('/system/lib/libreq.so', 'liba.so',
+ dt_runpath=['/vendor/lib']))
if __name__ == '__main__':
diff --git a/vndk/tools/definition-tool/tests/test_elfdump.py b/vndk/tools/definition-tool/tests/test_elfdump.py
index c738fd8..888c2d2 100755
--- a/vndk/tools/definition-tool/tests/test_elfdump.py
+++ b/vndk/tools/definition-tool/tests/test_elfdump.py
@@ -18,7 +18,7 @@
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
VNDK_DEF_TOOL = os.path.join(SCRIPT_DIR, '..', 'vndk_definition_tool.py')
-INPUT_DIR = os.path.join(SCRIPT_DIR ,'testdata', 'test_elfdump', 'input')
+INPUT_DIR = os.path.join(SCRIPT_DIR, 'testdata', 'test_elfdump', 'input')
EXPECTED_DIR = os.path.join(SCRIPT_DIR, 'testdata', 'test_elfdump', 'expected')
test_dir_base = None
@@ -155,14 +155,14 @@
class_name = 'ELFDumpTest_' + target_name
globals()[class_name] = type(
- class_name, (ELFDumpTest,),
- dict(test_main=test_main,
- test_libtest=test_libtest,
- test_libtest_rpath=test_libtest_rpath,
- test_libtest_rpath_multi=test_libtest_rpath_multi,
- test_libtest_runpath=test_libtest_runpath,
- test_libtest_runpath_multi=test_libtest_runpath_multi,
- target_name=target_name))
+ class_name, (ELFDumpTest,),
+ dict(test_main=test_main,
+ test_libtest=test_libtest,
+ test_libtest_rpath=test_libtest_rpath,
+ test_libtest_rpath_multi=test_libtest_rpath_multi,
+ test_libtest_runpath=test_libtest_runpath,
+ test_libtest_runpath_multi=test_libtest_runpath_multi,
+ target_name=target_name))
for target in ('arm', 'arm64', 'mips', 'mips64', 'x86', 'x86_64'):
diff --git a/vndk/tools/definition-tool/tests/test_module_info.py b/vndk/tools/definition-tool/tests/test_module_info.py
index f36edb0..d44a9eb 100755
--- a/vndk/tools/definition-tool/tests/test_module_info.py
+++ b/vndk/tools/definition-tool/tests/test_module_info.py
@@ -34,7 +34,7 @@
m.get_module_path('/system/lib64/hw/libC.so'))
self.assertEqual(
- [], m.get_module_path('/system/lib64/libdoes_not_exist.so'))
+ [], m.get_module_path('/system/lib64/libdoes_not_exist.so'))
if __name__ == '__main__':
diff --git a/vndk/tools/definition-tool/tests/test_tagged_dict.py b/vndk/tools/definition-tool/tests/test_tagged_dict.py
index 58ec396..9ca0271 100755
--- a/vndk/tools/definition-tool/tests/test_tagged_dict.py
+++ b/vndk/tools/definition-tool/tests/test_tagged_dict.py
@@ -103,37 +103,38 @@
tagged_paths = TaggedPathDict()
self.assertEqual(
- ['/system/lib/libc.so'],
- list(tagged_paths._enumerate_paths('/system/lib/libc.so')))
+ ['/system/lib/libc.so'],
+ list(tagged_paths._enumerate_paths('/system/lib/libc.so')))
self.assertEqual(
- ['/system/lib/libc.so', '/system/lib64/libc.so'],
- list(tagged_paths._enumerate_paths('/system/${LIB}/libc.so')))
+ ['/system/lib/libc.so', '/system/lib64/libc.so'],
+ list(tagged_paths._enumerate_paths('/system/${LIB}/libc.so')))
self.assertEqual(
- ['/system/lib/vndk/libutils.so',
- '/system/lib64/vndk/libutils.so'],
- list(tagged_paths._enumerate_paths(
- '/system/${LIB}/vndk${VNDK_VER}/libutils.so')))
+ ['/system/lib/vndk/libutils.so',
+ '/system/lib64/vndk/libutils.so'],
+ list(tagged_paths._enumerate_paths(
+ '/system/${LIB}/vndk${VNDK_VER}/libutils.so')))
tagged_paths = TaggedPathDict(['current', '27', '28'])
self.assertEqual(
- ['/system/lib/vndk/libutils.so',
- '/system/lib64/vndk/libutils.so',
- '/system/lib/vndk-27/libutils.so',
- '/system/lib64/vndk-27/libutils.so',
- '/system/lib/vndk-28/libutils.so',
- '/system/lib64/vndk-28/libutils.so'],
- list(tagged_paths._enumerate_paths(
- '/system/${LIB}/vndk${VNDK_VER}/libutils.so')))
+ ['/system/lib/vndk/libutils.so',
+ '/system/lib64/vndk/libutils.so',
+ '/system/lib/vndk-27/libutils.so',
+ '/system/lib64/vndk-27/libutils.so',
+ '/system/lib/vndk-28/libutils.so',
+ '/system/lib64/vndk-28/libutils.so'],
+ list(tagged_paths._enumerate_paths(
+ '/system/${LIB}/vndk${VNDK_VER}/libutils.so')))
self.assertEqual(
- ['/system/lib/vndk/libutils.so',
- '/system/lib/vndk-27/libutils.so',
- '/system/lib/vndk-28/libutils.so'],
- list(tagged_paths._enumerate_paths(
- '/system/lib/vndk${VNDK_VER}/libutils.so')))
+ ['/system/lib/vndk/libutils.so',
+ '/system/lib/vndk-27/libutils.so',
+ '/system/lib/vndk-28/libutils.so'],
+ list(tagged_paths._enumerate_paths(
+ '/system/lib/vndk${VNDK_VER}/libutils.so')))
+
def test_load_from_csv_empty(self):
try:
@@ -218,8 +219,8 @@
self.assertEqual('vndk_sp_indirect',
d.get_path_tag('/system/lib/lib_vndk_sp_indirect.so'))
self.assertEqual(
- 'vndk_sp_indirect_private',
- d.get_path_tag('/system/lib/lib_vndk_sp_indirect_private.so'))
+ 'vndk_sp_indirect_private',
+ d.get_path_tag('/system/lib/lib_vndk_sp_indirect_private.so'))
self.assertEqual('vndk', d.get_path_tag('/system/lib/lib_vndk.so'))
self.assertEqual('fwk_only',
d.get_path_tag('/system/lib/lib_fwk_only.so'))
@@ -368,17 +369,19 @@
def __init__(self):
self.lib_pt = [dict() for i in range(NUM_PARTITIONS)]
+
def add(self, path):
partition = PT_VENDOR if path.startswith('/vendor') else PT_SYSTEM
lib = MockELFLinkData(path)
self.lib_pt[partition][path] = lib
return lib
+
def compute_sp_lib(self, generic_refs=None):
vendor_libs = self.lib_pt[PT_VENDOR].values()
return MockSPLibResult(
- set(v for v in vendor_libs if 'lib_sp_hal.so' in v.path),
- set(v for v in vendor_libs if 'lib_sp_hal_dep.so' in v.path))
+ set(v for v in vendor_libs if 'lib_sp_hal.so' in v.path),
+ set(v for v in vendor_libs if 'lib_sp_hal_dep.so' in v.path))
class TaggedLibDictTest(unittest.TestCase):
@@ -389,13 +392,13 @@
self.lib_ll_ndk = self.graph.add('/system/lib/lib_ll_ndk.so')
self.lib_ll_ndk_indirect = \
- self.graph.add('/system/lib/lib_ll_ndk_indirect.so')
+ self.graph.add('/system/lib/lib_ll_ndk_indirect.so')
self.lib_vndk_sp = self.graph.add('/system/lib/lib_vndk_sp.so')
self.lib_vndk_sp_indirect = \
- self.graph.add('/system/lib/lib_vndk_sp_indirect.so')
+ self.graph.add('/system/lib/lib_vndk_sp_indirect.so')
self.lib_vndk_sp_indirect_private = \
- self.graph.add('/system/lib/lib_vndk_sp_indirect_private.so')
+ self.graph.add('/system/lib/lib_vndk_sp_indirect_private.so')
self.lib_vndk = self.graph.add('/system/lib/lib_vndk.so')
@@ -408,7 +411,7 @@
self.lib_vnd_only = self.graph.add('/vendor/lib/lib_vnd_only.so')
self.tagged_libs = TaggedLibDict.create_from_graph(
- self.graph, self.tagged_paths)
+ self.graph, self.tagged_paths)
def test_create_from_graph(self):
diff --git a/vndk/tools/definition-tool/tests/test_vndk.py b/vndk/tools/definition-tool/tests/test_vndk.py
index 196a15b..f8fafa5 100755
--- a/vndk/tools/definition-tool/tests/test_vndk.py
+++ b/vndk/tools/definition-tool/tests/test_vndk.py
@@ -32,9 +32,9 @@
gb.graph.normalize_partition_tags(set(), None)
self.assertRegexpMatches(
- stderr.getvalue(),
- 'error: .*: system exe/lib must not depend on vendor lib .*. '
- 'Assume such dependency does not exist.')
+ stderr.getvalue(),
+ 'error: .*: system exe/lib must not depend on vendor lib .*. '
+ 'Assume such dependency does not exist.')
self.assertNotIn(libvnd, libfwk.deps_needed)
self.assertNotIn(libfwk, libvnd.users_needed)
diff --git a/vndk/tools/definition-tool/tests/test_vndk_lib_dir.py b/vndk/tools/definition-tool/tests/test_vndk_lib_dir.py
index 0a323e5..6eb1e5f 100755
--- a/vndk/tools/definition-tool/tests/test_vndk_lib_dir.py
+++ b/vndk/tools/definition-tool/tests/test_vndk_lib_dir.py
@@ -22,92 +22,92 @@
def test_create_vndk_sp_dir_name(self):
self.assertEqual(
- 'vndk-sp', VNDKLibDir.create_vndk_sp_dir_name('current'))
+ 'vndk-sp', VNDKLibDir.create_vndk_sp_dir_name('current'))
self.assertEqual(
- 'vndk-sp-28', VNDKLibDir.create_vndk_sp_dir_name('28'))
+ 'vndk-sp-28', VNDKLibDir.create_vndk_sp_dir_name('28'))
def test_create_vndk_dir_name(self):
self.assertEqual(
- 'vndk', VNDKLibDir.create_vndk_dir_name('current'))
+ 'vndk', VNDKLibDir.create_vndk_dir_name('current'))
self.assertEqual(
- 'vndk-28', VNDKLibDir.create_vndk_dir_name('28'))
+ 'vndk-28', VNDKLibDir.create_vndk_dir_name('28'))
def test_extract_vndk_version_from_name(self):
self.assertEqual(
- 'current', VNDKLibDir.extract_version_from_name('vndk'))
+ 'current', VNDKLibDir.extract_version_from_name('vndk'))
self.assertEqual(
- 'current', VNDKLibDir.extract_version_from_name('vndk-sp'))
+ 'current', VNDKLibDir.extract_version_from_name('vndk-sp'))
self.assertEqual(
- '28', VNDKLibDir.extract_version_from_name('vndk-28'))
+ '28', VNDKLibDir.extract_version_from_name('vndk-28'))
self.assertEqual(
- '28', VNDKLibDir.extract_version_from_name('vndk-sp-28'))
+ '28', VNDKLibDir.extract_version_from_name('vndk-sp-28'))
self.assertEqual(
- 'p', VNDKLibDir.extract_version_from_name('vndk-p'))
+ 'p', VNDKLibDir.extract_version_from_name('vndk-p'))
self.assertEqual(
- 'p', VNDKLibDir.extract_version_from_name('vndk-sp-p'))
+ 'p', VNDKLibDir.extract_version_from_name('vndk-sp-p'))
def test_extract_vndk_version_from_path(self):
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/vndk/libexample.so')
+ '/system/lib64/vndk/libexample.so')
self.assertEqual('current', ans)
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/vndk-sp/libexample.so')
+ '/system/lib64/vndk-sp/libexample.so')
self.assertEqual('current', ans)
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/vndk-28/libexample.so')
+ '/system/lib64/vndk-28/libexample.so')
self.assertEqual('28', ans)
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/vndk-sp-28/libexample.so')
+ '/system/lib64/vndk-sp-28/libexample.so')
self.assertEqual('28', ans)
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/vndk-p/libexample.so')
+ '/system/lib64/vndk-p/libexample.so')
self.assertEqual('p', ans)
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/vndk-sp-p/libexample.so')
+ '/system/lib64/vndk-sp-p/libexample.so')
self.assertEqual('p', ans)
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/vndk-sp-p/hw/libexample.so')
+ '/system/lib64/vndk-sp-p/hw/libexample.so')
self.assertEqual('p', ans)
ans = VNDKLibDir.extract_version_from_path(
- '/system/lib64/libexample.so')
+ '/system/lib64/libexample.so')
self.assertEqual(None, ans)
def test_is_in_vndk_sp_dir(self):
self.assertFalse(VNDKLibDir.is_in_vndk_sp_dir('/system/lib/liba.so'))
self.assertFalse(
- VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk/liba.so'))
+ VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk/liba.so'))
self.assertFalse(
- VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-28/liba.so'))
+ VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-28/liba.so'))
self.assertFalse(
- VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-spec/liba.so'))
+ VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-spec/liba.so'))
self.assertTrue(
- VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-sp/liba.so'))
+ VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-sp/liba.so'))
self.assertTrue(
- VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-sp-28/liba.so'))
+ VNDKLibDir.is_in_vndk_sp_dir('/system/lib/vndk-sp-28/liba.so'))
def test_is_in_vndk_dir(self):
self.assertFalse(VNDKLibDir.is_in_vndk_dir('/system/lib/liba.so'))
self.assertTrue(VNDKLibDir.is_in_vndk_dir('/system/lib/vndk/liba.so'))
self.assertTrue(
- VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-28/liba.so'))
+ VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-28/liba.so'))
self.assertTrue(
- VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-spec/liba.so'))
+ VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-spec/liba.so'))
self.assertFalse(
- VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-sp/liba.so'))
+ VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-sp/liba.so'))
self.assertFalse(
- VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-sp-28/liba.so'))
+ VNDKLibDir.is_in_vndk_dir('/system/lib/vndk-sp-28/liba.so'))
def test_create_vndk_search_paths(self):
@@ -126,7 +126,7 @@
]
vndk_sp_dirs, vndk_dirs = \
- VNDKLibDir.create_vndk_search_paths(lib_dir, version)
+ VNDKLibDir.create_vndk_search_paths(lib_dir, version)
self.assertEqual(expected_vndk_sp, vndk_sp_dirs)
self.assertEqual(expected_vndk, vndk_dirs)
@@ -139,35 +139,34 @@
def test_create_from_dirs_unversioned(self):
input_dir = os.path.join(
- SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir',
- 'vndk_unversioned')
+ SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir', 'vndk_unversioned')
vndk_lib_dirs = VNDKLibDir.create_from_dirs(
- [os.path.join(input_dir, 'system')],
- [os.path.join(input_dir, 'vendor')])
+ [os.path.join(input_dir, 'system')],
+ [os.path.join(input_dir, 'vendor')])
self.assertIn('current', vndk_lib_dirs)
def test_create_from_dirs_versioned(self):
input_dir = os.path.join(
- SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir', 'vndk_versioned')
+ SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir', 'vndk_versioned')
vndk_lib_dirs = VNDKLibDir.create_from_dirs(
- [os.path.join(input_dir, 'system')],
- [os.path.join(input_dir, 'vendor')])
+ [os.path.join(input_dir, 'system')],
+ [os.path.join(input_dir, 'vendor')])
self.assertIn('28', vndk_lib_dirs)
def test_create_from_dirs_versioned_multiple(self):
input_dir = os.path.join(
- SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir',
- 'vndk_versioned_multiple')
+ SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir',
+ 'vndk_versioned_multiple')
vndk_lib_dirs = VNDKLibDir.create_from_dirs(
- [os.path.join(input_dir, 'system')],
- [os.path.join(input_dir, 'vendor')])
+ [os.path.join(input_dir, 'system')],
+ [os.path.join(input_dir, 'vendor')])
self.assertIn('28', vndk_lib_dirs)
self.assertIn('29', vndk_lib_dirs)
@@ -175,11 +174,11 @@
def test_create_from_dirs_versioned_32bit_only(self):
input_dir = os.path.join(
- SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir', 'vndk_32')
+ 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')])
+ [os.path.join(input_dir, 'system')],
+ [os.path.join(input_dir, 'vendor')])
self.assertIn('28', vndk_lib_dirs)
@@ -196,8 +195,8 @@
def test_get_ro_vndk_version(self):
input_dir = os.path.join(
- SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir',
- 'vndk_versioned_multiple')
+ SCRIPT_DIR, 'testdata', 'test_vndk_lib_dir',
+ 'vndk_versioned_multiple')
vendor_dirs = [os.path.join(input_dir, 'vendor')]
@@ -206,21 +205,20 @@
def test_sorted_versions(self):
self.assertEqual(
- ['20', '10', '2', '1'],
- VNDKLibDir.sorted_version(['1', '2', '10', '20']))
+ ['20', '10', '2', '1'],
+ VNDKLibDir.sorted_version(['1', '2', '10', '20']))
self.assertEqual(
- ['b', 'a', '20', '10', '2', '1'],
- VNDKLibDir.sorted_version(['1', '2', '10', '20', 'a', 'b']))
+ ['b', 'a', '20', '10', '2', '1'],
+ VNDKLibDir.sorted_version(['1', '2', '10', '20', 'a', 'b']))
self.assertEqual(
- ['a', '10b', '10', '2', '1'],
- VNDKLibDir.sorted_version(['1', '2', '10', 'a', '10b']))
+ ['a', '10b', '10', '2', '1'],
+ VNDKLibDir.sorted_version(['1', '2', '10', 'a', '10b']))
self.assertEqual(
- ['current', 'd', 'a', '10', '1'],
- VNDKLibDir.sorted_version(['1', '10', 'a', 'd', 'current']))
-
+ ['current', 'd', 'a', '10', '1'],
+ VNDKLibDir.sorted_version(['1', '10', 'a', 'd', 'current']))
if __name__ == '__main__':
diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py
index 996e5b2..ea3ee66 100755
--- a/vndk/tools/definition-tool/vndk_definition_tool.py
+++ b/vndk/tools/definition-tool/vndk_definition_tool.py
@@ -1926,21 +1926,23 @@
_VNDK_RESULT_FIELD_NAMES = (
- 'll_ndk', 'll_ndk_indirect',
- 'vndk_sp', 'vndk_sp_unused', 'vndk_sp_indirect',
- 'vndk_sp_indirect_unused', 'vndk_sp_indirect_private', 'vndk',
- 'vndk_indirect', 'fwk_only', 'fwk_only_rs', 'sp_hal', 'sp_hal_dep',
- 'vnd_only', 'vndk_ext', 'vndk_sp_ext', 'vndk_sp_indirect_ext',
- 'extra_vendor_libs')
+ 'll_ndk', 'll_ndk_indirect',
+ 'vndk_sp', 'vndk_sp_unused', 'vndk_sp_indirect',
+ 'vndk_sp_indirect_unused', 'vndk_sp_indirect_private', 'vndk',
+ 'vndk_indirect', 'fwk_only', 'fwk_only_rs', 'sp_hal', 'sp_hal_dep',
+ 'vnd_only', 'vndk_ext', 'vndk_sp_ext', 'vndk_sp_indirect_ext',
+ 'extra_vendor_libs')
+
VNDKResult = defaultnamedtuple('VNDKResult', _VNDK_RESULT_FIELD_NAMES, set())
_SIMPLE_VNDK_RESULT_FIELD_NAMES = (
- 'vndk_sp', 'vndk_sp_ext', 'extra_vendor_libs')
+ 'vndk_sp', 'vndk_sp_ext', 'extra_vendor_libs')
+
SimpleVNDKResult = defaultnamedtuple(
- 'SimpleVNDKResult', _SIMPLE_VNDK_RESULT_FIELD_NAMES, set())
+ 'SimpleVNDKResult', _SIMPLE_VNDK_RESULT_FIELD_NAMES, set())
class ELFLibDict(defaultnamedtuple('ELFLibDict', ('lib32', 'lib64'), {})):
