From c25a1ed85ded97e21378ba2a584502a4c9f99f15 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Fri, 10 Mar 2017 18:31:14 +0800 Subject: [PATCH] vndk-def: Fix vndk-ext computation. This commit fixes vndk-fwk-ext qand vndk-vnd-ext computation. We should hash imported_lib, an instance of ELFLinkData, instead of ELF object. Test: ./tests/test_vndk.py Change-Id: Idc5123bbf9980b76527b5fa295a1fe01c8f7f44c --- vndk/tools/definition-tool/tests/test_vndk.py | 66 ++++++++++++++++++- .../vndk_ext_ref/system/lib/libRS.so.sym | 8 +++ .../vndk_ext_ref/system/lib/libc.so.sym | 12 ++++ .../vndk_ext_ref/system/lib/libcutils.so.sym | 9 +++ .../vndk_ext_ref/system/lib/libdl.so.sym | 6 ++ .../vndk_ext_ref/system/lib/libm.so.sym | 5 ++ .../vndk_ext_ref/system/lib64/libRS.so.sym | 8 +++ .../vndk_ext_ref/system/lib64/libc.so.sym | 12 ++++ .../system/lib64/libcutils.so.sym | 9 +++ .../vndk_ext_ref/system/lib64/libdl.so.sym | 6 ++ .../vndk_ext_ref/system/lib64/libm.so.sym | 5 ++ .../vendor/lib/libEGL_chipset.so.sym | 9 +++ .../vendor/lib64/libEGL_chipset.so.sym | 9 +++ .../vndk_fwk_ext/system/lib/libRS.so.sym | 9 +++ .../vndk_fwk_ext/system/lib/libRS_jni.so.sym | 6 ++ .../vndk_fwk_ext/system/lib/libc.so.sym | 12 ++++ .../vndk_fwk_ext/system/lib/libcutils.so.sym | 9 +++ .../vndk_fwk_ext/system/lib/libdl.so.sym | 6 ++ .../vndk_fwk_ext/system/lib/libm.so.sym | 5 ++ .../vndk_fwk_ext/system/lib64/libRS.so.sym | 9 +++ .../system/lib64/libRS_jni.so.sym | 6 ++ .../vndk_fwk_ext/system/lib64/libc.so.sym | 12 ++++ .../system/lib64/libcutils.so.sym | 9 +++ .../vndk_fwk_ext/system/lib64/libdl.so.sym | 6 ++ .../vndk_fwk_ext/system/lib64/libm.so.sym | 5 ++ .../vendor/lib/libEGL_chipset.so.sym | 9 +++ .../vendor/lib/libRSDriver_chipset.so.sym | 5 ++ .../vendor/lib64/libEGL_chipset.so.sym | 9 +++ .../vendor/lib64/libRSDriver_chipset.so.sym | 5 ++ .../vndk_vnd_ext/system/lib/libRS.so.sym | 9 +++ .../vndk_vnd_ext/system/lib/libRS_jni.so.sym | 5 ++ .../vndk_vnd_ext/system/lib/libc.so.sym | 12 ++++ .../vndk_vnd_ext/system/lib/libcutils.so.sym | 9 +++ .../vndk_vnd_ext/system/lib/libdl.so.sym | 6 ++ .../vndk_vnd_ext/system/lib/libm.so.sym | 5 ++ .../vndk_vnd_ext/system/lib64/libRS.so.sym | 9 +++ .../system/lib64/libRS_jni.so.sym | 5 ++ .../vndk_vnd_ext/system/lib64/libc.so.sym | 12 ++++ .../system/lib64/libcutils.so.sym | 9 +++ .../vndk_vnd_ext/system/lib64/libdl.so.sym | 6 ++ .../vndk_vnd_ext/system/lib64/libm.so.sym | 5 ++ .../vendor/lib/libEGL_chipset.so.sym | 9 +++ .../vendor/lib/libRSDriver_chipset.so.sym | 6 ++ .../vendor/lib64/libEGL_chipset.so.sym | 9 +++ .../vendor/lib64/libRSDriver_chipset.so.sym | 6 ++ .../definition-tool/vndk_definition_tool.py | 2 +- 46 files changed, 408 insertions(+), 2 deletions(-) create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libRS.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libc.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libcutils.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libdl.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libm.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libRS.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libc.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libcutils.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libdl.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libm.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib/libEGL_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib64/libEGL_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS_jni.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libc.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libcutils.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libdl.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libm.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS_jni.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libc.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libcutils.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libdl.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libm.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libEGL_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libRSDriver_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libEGL_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libRSDriver_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS_jni.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libc.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libcutils.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libdl.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libm.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS_jni.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libc.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libcutils.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libdl.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libm.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libEGL_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libRSDriver_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libEGL_chipset.so.sym create mode 100644 vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libRSDriver_chipset.so.sym diff --git a/vndk/tools/definition-tool/tests/test_vndk.py b/vndk/tools/definition-tool/tests/test_vndk.py index 8938e68aa..c63786877 100755 --- a/vndk/tools/definition-tool/tests/test_vndk.py +++ b/vndk/tools/definition-tool/tests/test_vndk.py @@ -9,7 +9,8 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import unittest from compat import StringIO -from vndk_definition_tool import ELF, ELFLinker, PT_SYSTEM, PT_VENDOR +from vndk_definition_tool import (ELF, ELFLinker, PT_SYSTEM, PT_VENDOR, + GenericRefs) SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) TESTDATA_DIR = os.path.join(SCRIPT_DIR ,'testdata', 'test_vndk') @@ -42,6 +43,69 @@ class ELFLinkerVNDKTest(unittest.TestCase): self.assertEqual([], self._get_paths_from_nodes(vndk.vndk_fwk_ext)) self.assertEqual([], self._get_paths_from_nodes(vndk.vndk_vnd_ext)) + def test_compute_vndk_fwk_ext(self): + class MockBannedLibs(object): + def is_banned(self, name): + return False + + generic_refs_dir = os.path.join(TESTDATA_DIR, 'vndk_ext_ref') + + generic_refs = GenericRefs.create_from_dir(generic_refs_dir) + + input_dir = os.path.join(TESTDATA_DIR, 'vndk_fwk_ext') + + graph = ELFLinker.create_from_dump( + system_dirs=[os.path.join(input_dir, 'system')], + vendor_dirs=[os.path.join(input_dir, 'vendor')], + generic_refs=generic_refs) + + vndk = graph.compute_vndk(sp_hals=set(), vndk_stable=set(), + vndk_customized_for_system=set(), + vndk_customized_for_vendor=set(), + generic_refs=generic_refs, + banned_libs=MockBannedLibs()) + + self.assertEqual(['/system/lib/vndk/libRS.so', + '/system/lib/vndk/libcutils.so', + '/system/lib64/vndk/libRS.so', + '/system/lib64/vndk/libcutils.so'], + self._get_paths_from_nodes(vndk.vndk_core)) + self.assertEqual(['/system/lib/libRS.so', + '/system/lib64/libRS.so'], + self._get_paths_from_nodes(vndk.vndk_fwk_ext)) + self.assertEqual([], self._get_paths_from_nodes(vndk.vndk_vnd_ext)) + + def test_compute_vndk_vnd_ext(self): + class MockBannedLibs(object): + def is_banned(self, name): + return False + + generic_refs_dir = os.path.join(TESTDATA_DIR, 'vndk_ext_ref') + + generic_refs = GenericRefs.create_from_dir(generic_refs_dir) + + input_dir = os.path.join(TESTDATA_DIR, 'vndk_vnd_ext') + + graph = ELFLinker.create_from_dump( + system_dirs=[os.path.join(input_dir, 'system')], + vendor_dirs=[os.path.join(input_dir, 'vendor')], + generic_refs=generic_refs) + + vndk = graph.compute_vndk(sp_hals=set(), vndk_stable=set(), + vndk_customized_for_system=set(), + vndk_customized_for_vendor=set(), + generic_refs=generic_refs, + banned_libs=MockBannedLibs()) + + self.assertEqual(['/system/lib/vndk/libRS.so', + '/system/lib/vndk/libcutils.so', + '/system/lib64/vndk/libRS.so', + '/system/lib64/vndk/libcutils.so'], + self._get_paths_from_nodes(vndk.vndk_core)) + self.assertEqual([], self._get_paths_from_nodes(vndk.vndk_fwk_ext)) + self.assertEqual(['/system/lib/libRS.so', '/system/lib64/libRS.so'], + self._get_paths_from_nodes(vndk.vndk_vnd_ext)) + if __name__ == '__main__': unittest.main() diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libRS.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libRS.so.sym new file mode 100644 index 000000000..6b2702a5b --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libRS.so.sym @@ -0,0 +1,8 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libdl.so +EXP_SYMBOL rsContextCreate +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libc.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libc.so.sym new file mode 100644 index 000000000..0f9b747cd --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libc.so.sym @@ -0,0 +1,12 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libdl.so +DT_NEEDED libm.so +EXP_SYMBOL fclose +EXP_SYMBOL fopen +EXP_SYMBOL fread +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL cos +IMP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libcutils.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libcutils.so.sym new file mode 100644 index 000000000..770ee8454 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libcutils.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libc.so +DT_NEEDED libdl.so +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libdl.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libdl.so.sym new file mode 100644 index 000000000..9cfd2a2b2 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libdl.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +EXP_SYMBOL dlclose +EXP_SYMBOL dlopen +EXP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libm.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libm.so.sym new file mode 100644 index 000000000..3919c0230 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libm.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +EXP_SYMBOL cos +EXP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libRS.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libRS.so.sym new file mode 100644 index 000000000..95408efd7 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libRS.so.sym @@ -0,0 +1,8 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libdl.so +EXP_SYMBOL rsContextCreate +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libc.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libc.so.sym new file mode 100644 index 000000000..e3843e614 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libc.so.sym @@ -0,0 +1,12 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libdl.so +DT_NEEDED libm.so +EXP_SYMBOL fclose +EXP_SYMBOL fopen +EXP_SYMBOL fread +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL cos +IMP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libcutils.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libcutils.so.sym new file mode 100644 index 000000000..5a4fbf7bf --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libcutils.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libc.so +DT_NEEDED libdl.so +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libdl.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libdl.so.sym new file mode 100644 index 000000000..5e06f27d8 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libdl.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +EXP_SYMBOL dlclose +EXP_SYMBOL dlopen +EXP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libm.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libm.so.sym new file mode 100644 index 000000000..e9c0ca4a7 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libm.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +EXP_SYMBOL cos +EXP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib/libEGL_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib/libEGL_chipset.so.sym new file mode 100644 index 000000000..076d58ff3 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib/libEGL_chipset.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libc.so +DT_NEEDED libcutils.so +DT_NEEDED libdl.so +EXP_SYMBOL eglGetDisplay +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib64/libEGL_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib64/libEGL_chipset.so.sym new file mode 100644 index 000000000..2429b9c5c --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/vendor/lib64/libEGL_chipset.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libc.so +DT_NEEDED libcutils.so +DT_NEEDED libdl.so +EXP_SYMBOL eglGetDisplay +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS.so.sym new file mode 100644 index 000000000..cbb441f5d --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libdl.so +EXP_SYMBOL rsContextCreate +EXP_SYMBOL rsContextDestroy +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS_jni.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS_jni.so.sym new file mode 100644 index 000000000..81b801ad1 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS_jni.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate +IMP_SYMBOL rsContextDestroy diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libc.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libc.so.sym new file mode 100644 index 000000000..0f9b747cd --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libc.so.sym @@ -0,0 +1,12 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libdl.so +DT_NEEDED libm.so +EXP_SYMBOL fclose +EXP_SYMBOL fopen +EXP_SYMBOL fread +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL cos +IMP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libcutils.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libcutils.so.sym new file mode 100644 index 000000000..770ee8454 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libcutils.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libc.so +DT_NEEDED libdl.so +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libdl.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libdl.so.sym new file mode 100644 index 000000000..9cfd2a2b2 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libdl.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +EXP_SYMBOL dlclose +EXP_SYMBOL dlopen +EXP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libm.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libm.so.sym new file mode 100644 index 000000000..3919c0230 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libm.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +EXP_SYMBOL cos +EXP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS.so.sym new file mode 100644 index 000000000..ccb60c897 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libdl.so +EXP_SYMBOL rsContextCreate +EXP_SYMBOL rsContextDestroy +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS_jni.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS_jni.so.sym new file mode 100644 index 000000000..12f9ec7fa --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS_jni.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate +IMP_SYMBOL rsContextDestroy diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libc.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libc.so.sym new file mode 100644 index 000000000..e3843e614 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libc.so.sym @@ -0,0 +1,12 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libdl.so +DT_NEEDED libm.so +EXP_SYMBOL fclose +EXP_SYMBOL fopen +EXP_SYMBOL fread +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL cos +IMP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libcutils.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libcutils.so.sym new file mode 100644 index 000000000..5a4fbf7bf --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libcutils.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libc.so +DT_NEEDED libdl.so +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libdl.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libdl.so.sym new file mode 100644 index 000000000..5e06f27d8 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libdl.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +EXP_SYMBOL dlclose +EXP_SYMBOL dlopen +EXP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libm.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libm.so.sym new file mode 100644 index 000000000..e9c0ca4a7 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libm.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +EXP_SYMBOL cos +EXP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libEGL_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libEGL_chipset.so.sym new file mode 100644 index 000000000..076d58ff3 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libEGL_chipset.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libc.so +DT_NEEDED libcutils.so +DT_NEEDED libdl.so +EXP_SYMBOL eglGetDisplay +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libRSDriver_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libRSDriver_chipset.so.sym new file mode 100644 index 000000000..9a5ee2079 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib/libRSDriver_chipset.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libEGL_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libEGL_chipset.so.sym new file mode 100644 index 000000000..2429b9c5c --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libEGL_chipset.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libc.so +DT_NEEDED libcutils.so +DT_NEEDED libdl.so +EXP_SYMBOL eglGetDisplay +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libRSDriver_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libRSDriver_chipset.so.sym new file mode 100644 index 000000000..3ebdf81bd --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/vendor/lib64/libRSDriver_chipset.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS.so.sym new file mode 100644 index 000000000..cbb441f5d --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libdl.so +EXP_SYMBOL rsContextCreate +EXP_SYMBOL rsContextDestroy +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS_jni.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS_jni.so.sym new file mode 100644 index 000000000..9a5ee2079 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS_jni.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libc.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libc.so.sym new file mode 100644 index 000000000..0f9b747cd --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libc.so.sym @@ -0,0 +1,12 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libdl.so +DT_NEEDED libm.so +EXP_SYMBOL fclose +EXP_SYMBOL fopen +EXP_SYMBOL fread +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL cos +IMP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libcutils.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libcutils.so.sym new file mode 100644 index 000000000..770ee8454 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libcutils.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libc.so +DT_NEEDED libdl.so +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libdl.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libdl.so.sym new file mode 100644 index 000000000..9cfd2a2b2 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libdl.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +EXP_SYMBOL dlclose +EXP_SYMBOL dlopen +EXP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libm.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libm.so.sym new file mode 100644 index 000000000..3919c0230 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libm.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +EXP_SYMBOL cos +EXP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS.so.sym new file mode 100644 index 000000000..ccb60c897 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libdl.so +EXP_SYMBOL rsContextCreate +EXP_SYMBOL rsContextDestroy +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS_jni.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS_jni.so.sym new file mode 100644 index 000000000..3ebdf81bd --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS_jni.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libc.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libc.so.sym new file mode 100644 index 000000000..e3843e614 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libc.so.sym @@ -0,0 +1,12 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libdl.so +DT_NEEDED libm.so +EXP_SYMBOL fclose +EXP_SYMBOL fopen +EXP_SYMBOL fread +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL cos +IMP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libcutils.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libcutils.so.sym new file mode 100644 index 000000000..5a4fbf7bf --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libcutils.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libc.so +DT_NEEDED libdl.so +IMP_SYMBOL dlclose +IMP_SYMBOL dlopen +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libdl.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libdl.so.sym new file mode 100644 index 000000000..5e06f27d8 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libdl.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +EXP_SYMBOL dlclose +EXP_SYMBOL dlopen +EXP_SYMBOL dlsym diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libm.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libm.so.sym new file mode 100644 index 000000000..e9c0ca4a7 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libm.so.sym @@ -0,0 +1,5 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +EXP_SYMBOL cos +EXP_SYMBOL sin diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libEGL_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libEGL_chipset.so.sym new file mode 100644 index 000000000..076d58ff3 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libEGL_chipset.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libc.so +DT_NEEDED libcutils.so +DT_NEEDED libdl.so +EXP_SYMBOL eglGetDisplay +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libRSDriver_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libRSDriver_chipset.so.sym new file mode 100644 index 000000000..81b801ad1 --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib/libRSDriver_chipset.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 32 +EI_DATA Little-Endian +E_MACHINE EM_ARM +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate +IMP_SYMBOL rsContextDestroy diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libEGL_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libEGL_chipset.so.sym new file mode 100644 index 000000000..2429b9c5c --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libEGL_chipset.so.sym @@ -0,0 +1,9 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libc.so +DT_NEEDED libcutils.so +DT_NEEDED libdl.so +EXP_SYMBOL eglGetDisplay +IMP_SYMBOL fclose +IMP_SYMBOL fopen diff --git a/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libRSDriver_chipset.so.sym b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libRSDriver_chipset.so.sym new file mode 100644 index 000000000..12f9ec7fa --- /dev/null +++ b/vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/vendor/lib64/libRSDriver_chipset.so.sym @@ -0,0 +1,6 @@ +EI_CLASS 64 +EI_DATA Little-Endian +E_MACHINE EM_AARCH64 +DT_NEEDED libRS.so +IMP_SYMBOL rsContextCreate +IMP_SYMBOL rsContextDestroy diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py index 0385f2a7a..0cd95835c 100755 --- a/vndk/tools/definition-tool/vndk_definition_tool.py +++ b/vndk/tools/definition-tool/vndk_definition_tool.py @@ -811,7 +811,7 @@ class ELFLinker(object): if generic_refs: ref_lib = generic_refs.refs.get(imported_lib.path) if not ref_lib or not symbol in ref_lib.exported_symbols: - lib.imported_ext_symbols[ref_lib].add(symbol) + lib.imported_ext_symbols[imported_lib].add(symbol) def _resolve_lib_dt_needed(self, lib, resolver): imported_libs = []