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

vndk-def: Add tag file support to deps-insight

Browse Source 
am: 08d4dc40b6

Change-Id: I7508fa52d2c1b430a7852efe2e042f4985861381
This commit is contained in:
Logan Chien
2017-06-09 22:10:30 +00:00
committed by android-build-merger
parent 157746279c 08d4dc40b6
commit fe60f6c892
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1283,8 +1283,7 @@ class ELFLinker(object):
raise ValueError('unknown action \"{}\"'.format(flag)) raise ValueError('unknown action \"{}\"'.format(flag))
return (follow, warn) return (follow, warn)
def compute_degenerated_vndk(self, sp_lib, generic_refs, def compute_degenerated_vndk(self, generic_refs, tagged_paths=None,
tagged_paths=None,
action_ineligible_vndk_sp='warn', action_ineligible_vndk_sp='warn',
action_ineligible_vndk='warn'): action_ineligible_vndk='warn'):
# Find LL-NDK and SP-NDK libs. # Find LL-NDK and SP-NDK libs.
@@ -1862,6 +1861,18 @@ class VNDKCommandBase(ELFGraphCommand):
parser.add_argument('--no-default-dlopen-deps', action='store_true', parser.add_argument('--no-default-dlopen-deps', action='store_true',
help='do not add default dlopen dependencies') help='do not add default dlopen dependencies')
parser.add_argument('--tag-file', help='lib tag file')
parser.add_argument(
'--action-ineligible-vndk-sp', default='warn',
help='action when a sp-hal uses non-vndk-sp libs '
'(option: follow,warn,ignore)')
parser.add_argument(
'--action-ineligible-vndk', default='warn',
help='action when a vendor lib/exe uses fwk-only libs '
'(option: follow,warn,ignore)')
def create_from_args(self, args): def create_from_args(self, args):
"""Create all essential data structures for VNDK computation.""" """Create all essential data structures for VNDK computation."""
@@ -1874,7 +1885,12 @@ class VNDKCommandBase(ELFGraphCommand):
'minimum_dlopen_deps.txt') 'minimum_dlopen_deps.txt')
graph.load_extra_deps(minimum_dlopen_deps) graph.load_extra_deps(minimum_dlopen_deps)
return (generic_refs, graph) if args.tag_file:
tagged_paths = TaggedPathDict.create_from_csv_path(args.tag_file)
else:
tagged_paths = None
return (generic_refs, graph, tagged_paths)
class VNDKCommand(VNDKCommandBase): class VNDKCommand(VNDKCommandBase):
@@ -1893,18 +1909,6 @@ class VNDKCommand(VNDKCommandBase):
'--full', action='store_true', '--full', action='store_true',
help='print all classification') help='print all classification')
parser.add_argument('--tag-file', help='lib tag file')
parser.add_argument(
'--action-ineligible-vndk-sp', default='warn',
help='action when a sp-hal uses non-vndk-sp libs '
'(option: follow,warn,ignore)')
parser.add_argument(
'--action-ineligible-vndk', default='warn',
help='action when a vendor lib/exe uses fwk-only libs '
'(option: follow,warn,ignore)')
parser.add_argument( parser.add_argument(
'--output-format', default='tag', '--output-format', default='tag',
help='output format for vndk classification') help='output format for vndk classification')
@@ -2001,7 +2005,7 @@ class VNDKCommand(VNDKCommandBase):
file.write(template) file.write(template)
def main(self, args): def main(self, args):
generic_refs, graph = self.create_from_args(args) generic_refs, graph, tagged_paths = self.create_from_args(args)
# Check the API extensions to NDK libraries. # Check the API extensions to NDK libraries.
if generic_refs: if generic_refs:
@@ -2010,16 +2014,10 @@ class VNDKCommand(VNDKCommandBase):
if args.warn_incorrect_partition: if args.warn_incorrect_partition:
self._warn_incorrect_partition(graph) self._warn_incorrect_partition(graph)
if args.tag_file:
tagged_paths = TaggedPathDict.create_from_csv_path(args.tag_file)
else:
tagged_paths = None
# Compute vndk heuristics. # Compute vndk heuristics.
sp_lib = graph.compute_sp_lib(generic_refs)
vndk_lib = graph.compute_degenerated_vndk( vndk_lib = graph.compute_degenerated_vndk(
sp_lib, generic_refs, tagged_paths, generic_refs, tagged_paths, args.action_ineligible_vndk_sp,
args.action_ineligible_vndk_sp, args.action_ineligible_vndk) args.action_ineligible_vndk)
# Print results. # Print results.
if args.output_format == 'make': if args.output_format == 'make':
@@ -2042,11 +2040,12 @@ class DepsInsightCommand(VNDKCommandBase):
'--output', '-o', help='output directory') '--output', '-o', help='output directory')
def main(self, args): def main(self, args):
generic_refs, graph = self.create_from_args(args) generic_refs, graph, tagged_paths = self.create_from_args(args)
# Compute vndk heuristics. # Compute vndk heuristics.
sp_lib = graph.compute_sp_lib(generic_refs) vndk_lib = graph.compute_degenerated_vndk(
vndk_lib = graph.compute_degenerated_vndk(sp_lib, generic_refs) generic_refs, tagged_paths, args.action_ineligible_vndk_sp,
args.action_ineligible_vndk)
# Serialize data. # Serialize data.
strs = [] strs = []