LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vndk-def: Rename ELFLinker.add() to add_lib().

Browse Source 
Test: ./tests/run.py
Change-Id: If187486736d030ea4418beadd2fca7fe62362935
This commit is contained in:
Logan Chien
2017-03-20 17:18:55 +08:00
parent 6c81087023
commit a4c4d370bb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vndk/tools/definition-tool/tests/test_elf_linker.py
View File

@@ -43,7 +43,7 @@ class GraphBuilder(object):
exported_symbols=exported_symbols,
imported_symbols=imported_symbols)
node = self.graph.add(partition, path, elf)
node = self.graph.add_lib(partition, path, elf)
setattr(self, name + '_' + elf.elf_class_name, node)
return node

10
vndk/tools/definition-tool/vndk_definition_tool.py
View File

@@ -727,7 +727,7 @@ class ELFLinker(object):
self.lib32_resolver = ELFResolver(self.lib32, self.LIB32_SEARCH_PATH)
self.lib64_resolver = ELFResolver(self.lib64, self.LIB64_SEARCH_PATH)
def add(self, partition, path, elf):
def add_lib(self, partition, path, elf):
node = ELFLinkData(partition, path, elf)
if elf.is_32bit:
self.lib32[path] = node
@@ -780,9 +780,9 @@ class ELFLinker(object):
for path, elf in scan_elf_files(root):
short_path = os.path.join('/', partition_name, path[prefix_len:])
if alter_subdirs and alter_patt.match(path):
self.add(alter_partition, short_path, elf)
self.add_lib(alter_partition, short_path, elf)
else:
self.add(partition, short_path, elf)
self.add_lib(partition, short_path, elf)
def load_extra_deps(self, path):
patt = re.compile('([^:]*):\\s*(.*)')
@@ -1086,7 +1086,7 @@ class ELFLinker(object):
# Create new vndk-core lib from generic reference.
vndk_lib_path = get_vndk_core_lib_name(lib)
vndk_lib = self.add(PT_SYSTEM, vndk_lib_path, elf)
vndk_lib = self.add_lib(PT_SYSTEM, vndk_lib_path, elf)
# Resovle the library dependencies.
resolver = self.lib32_resolver if lib.elf.is_32bit else \
@@ -1131,7 +1131,7 @@ class ELFLinker(object):
path = lib.path
# Clone lib object for vndk-vnd-ext.
cloned_lib = self.add(PT_VENDOR, path, lib.elf)
cloned_lib = self.add_lib(PT_VENDOR, path, lib.elf)
# Update the usages.
for user in list(lib.dt_users):