From 3e641efbe6cbb49f3d8b2f44e4db13a3a420601b Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 16 Mar 2017 08:43:32 +0800 Subject: [PATCH] vndk-def: Don't remove all deps in normalization. This commit no longer removes all dependencies (including system and vendor dependencies) when a generic reference library has a dependency to a library on the vendor partition. After this commit is merged, vndk_definition_tool.py will only remove the offending dependencies. Test: Run vndk_definition_tool.py against bullhead build with tweaked dependencies. Change-Id: Id6d23112128d9bbfec9e1e4430677a07f20fd193 --- vndk/tools/definition-tool/vndk_definition_tool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py index 78169d9a6..7c1653848 100755 --- a/vndk/tools/definition-tool/vndk_definition_tool.py +++ b/vndk/tools/definition-tool/vndk_definition_tool.py @@ -996,14 +996,14 @@ class ELFLinker(object): 'vendor lib {}. Assume such dependency does ' 'not exist.'.format(lib.path, dep.path), file=sys.stderr) - lib.remove_dep(dep, ELFLinkData.NEEDED) + lib.remove_dep(dep, ELFLinkData.NEEDED) for dep in list(lib.dl_deps): if not is_system_lib_or_sp_hal(dep): print('error: {}: system exe/lib must not dlopen() ' 'vendor lib {}. Assume such dependency does ' 'not exist.'.format(lib.path, dep.path), file=sys.stderr) - lib.remove_dep(dep, ELFLinkData.DLOPEN) + lib.remove_dep(dep, ELFLinkData.DLOPEN) else: # If lib is not in AOSP generic reference, then we assume that # lib must be moved to vendor partition.