Merge "vndk-def: Fix vndk-ext computation." am: edaab1ab96 am: 4c38db13b4
am: 187b248727
Change-Id: I1fc820d770ecce37f607282445abd6f8b7b76056
This commit is contained in:
@@ -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()
|
||||
|
||||
8
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libRS.so.sym
vendored
Normal file
8
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libRS.so.sym
vendored
Normal file
@@ -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
|
||||
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libc.so.sym
vendored
Normal file
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libc.so.sym
vendored
Normal file
@@ -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
|
||||
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libcutils.so.sym
vendored
Normal file
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libcutils.so.sym
vendored
Normal file
@@ -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
|
||||
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libdl.so.sym
vendored
Normal file
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libdl.so.sym
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
EXP_SYMBOL dlclose
|
||||
EXP_SYMBOL dlopen
|
||||
EXP_SYMBOL dlsym
|
||||
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libm.so.sym
vendored
Normal file
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib/libm.so.sym
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
EXP_SYMBOL cos
|
||||
EXP_SYMBOL sin
|
||||
8
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libRS.so.sym
vendored
Normal file
8
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libRS.so.sym
vendored
Normal file
@@ -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
|
||||
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libc.so.sym
vendored
Normal file
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libc.so.sym
vendored
Normal file
@@ -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
|
||||
@@ -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
|
||||
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libdl.so.sym
vendored
Normal file
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libdl.so.sym
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
EXP_SYMBOL dlclose
|
||||
EXP_SYMBOL dlopen
|
||||
EXP_SYMBOL dlsym
|
||||
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libm.so.sym
vendored
Normal file
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_ext_ref/system/lib64/libm.so.sym
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
EXP_SYMBOL cos
|
||||
EXP_SYMBOL sin
|
||||
@@ -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
|
||||
@@ -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
|
||||
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS.so.sym
vendored
Normal file
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS.so.sym
vendored
Normal file
@@ -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
|
||||
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS_jni.so.sym
vendored
Normal file
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libRS_jni.so.sym
vendored
Normal file
@@ -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
|
||||
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libc.so.sym
vendored
Normal file
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libc.so.sym
vendored
Normal file
@@ -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
|
||||
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libcutils.so.sym
vendored
Normal file
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libcutils.so.sym
vendored
Normal file
@@ -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
|
||||
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libdl.so.sym
vendored
Normal file
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libdl.so.sym
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
EXP_SYMBOL dlclose
|
||||
EXP_SYMBOL dlopen
|
||||
EXP_SYMBOL dlsym
|
||||
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libm.so.sym
vendored
Normal file
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib/libm.so.sym
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
EXP_SYMBOL cos
|
||||
EXP_SYMBOL sin
|
||||
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS.so.sym
vendored
Normal file
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libRS.so.sym
vendored
Normal file
@@ -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
|
||||
@@ -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
|
||||
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libc.so.sym
vendored
Normal file
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libc.so.sym
vendored
Normal file
@@ -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
|
||||
@@ -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
|
||||
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libdl.so.sym
vendored
Normal file
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libdl.so.sym
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
EXP_SYMBOL dlclose
|
||||
EXP_SYMBOL dlopen
|
||||
EXP_SYMBOL dlsym
|
||||
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libm.so.sym
vendored
Normal file
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_fwk_ext/system/lib64/libm.so.sym
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
EXP_SYMBOL cos
|
||||
EXP_SYMBOL sin
|
||||
@@ -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
|
||||
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
DT_NEEDED libRS.so
|
||||
IMP_SYMBOL rsContextCreate
|
||||
@@ -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
|
||||
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
DT_NEEDED libRS.so
|
||||
IMP_SYMBOL rsContextCreate
|
||||
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS.so.sym
vendored
Normal file
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS.so.sym
vendored
Normal file
@@ -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
|
||||
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS_jni.so.sym
vendored
Normal file
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libRS_jni.so.sym
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
DT_NEEDED libRS.so
|
||||
IMP_SYMBOL rsContextCreate
|
||||
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libc.so.sym
vendored
Normal file
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libc.so.sym
vendored
Normal file
@@ -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
|
||||
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libcutils.so.sym
vendored
Normal file
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libcutils.so.sym
vendored
Normal file
@@ -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
|
||||
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libdl.so.sym
vendored
Normal file
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libdl.so.sym
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
EXP_SYMBOL dlclose
|
||||
EXP_SYMBOL dlopen
|
||||
EXP_SYMBOL dlsym
|
||||
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libm.so.sym
vendored
Normal file
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib/libm.so.sym
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 32
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_ARM
|
||||
EXP_SYMBOL cos
|
||||
EXP_SYMBOL sin
|
||||
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS.so.sym
vendored
Normal file
9
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libRS.so.sym
vendored
Normal file
@@ -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
|
||||
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
DT_NEEDED libRS.so
|
||||
IMP_SYMBOL rsContextCreate
|
||||
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libc.so.sym
vendored
Normal file
12
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libc.so.sym
vendored
Normal file
@@ -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
|
||||
@@ -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
|
||||
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libdl.so.sym
vendored
Normal file
6
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libdl.so.sym
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
EXP_SYMBOL dlclose
|
||||
EXP_SYMBOL dlopen
|
||||
EXP_SYMBOL dlsym
|
||||
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libm.so.sym
vendored
Normal file
5
vndk/tools/definition-tool/tests/testdata/test_vndk/vndk_vnd_ext/system/lib64/libm.so.sym
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
EI_CLASS 64
|
||||
EI_DATA Little-Endian
|
||||
E_MACHINE EM_AARCH64
|
||||
EXP_SYMBOL cos
|
||||
EXP_SYMBOL sin
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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 = []
|
||||
|
||||
Reference in New Issue
Block a user