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

Merge "vndk-def: Remove "follow" from default action"

Browse Source
This commit is contained in:
Treehugger Robot
2017-06-09 07:13:30 +00:00
committed by Gerrit Code Review
parent 72bc6acd53 8e208817a3
commit a802f73190
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1279,8 +1279,8 @@ class ELFLinker(object):
def compute_degenerated_vndk(self, sp_lib, generic_refs, def compute_degenerated_vndk(self, sp_lib, generic_refs,
tagged_paths=None, tagged_paths=None,
action_ineligible_vndk_sp='follow,warn', action_ineligible_vndk_sp='warn',
action_ineligible_vndk='follow,warn'): action_ineligible_vndk='warn'):
# Find LL-NDK and SP-NDK libs. # Find LL-NDK and SP-NDK libs.
ll_ndk = set(lib for lib in self.all_libs() if lib.is_ll_ndk) ll_ndk = set(lib for lib in self.all_libs() if lib.is_ll_ndk)
sp_ndk = set(lib for lib in self.all_libs() if lib.is_sp_ndk) sp_ndk = set(lib for lib in self.all_libs() if lib.is_sp_ndk)
@@ -1890,12 +1890,14 @@ class VNDKCommand(VNDKCommandBase):
parser.add_argument('--tag-file', help='lib tag file') parser.add_argument('--tag-file', help='lib tag file')
parser.add_argument( parser.add_argument(
'--action-ineligible-vndk-sp', default='warn,follow', '--action-ineligible-vndk-sp', default='warn',
help='action when a sp-hal uses non-vndk-sp libs') help='action when a sp-hal uses non-vndk-sp libs '
'(option: follow,warn,ignore)')
parser.add_argument( parser.add_argument(
'--action-ineligible-vndk', default='warn,follow', '--action-ineligible-vndk', default='warn',
help='action when a vendor lib/exe uses fwk-only libs') help='action when a vendor lib/exe uses fwk-only libs '
'(option: follow,warn,ignore)')
def _warn_incorrect_partition_lib_set(self, lib_set, partition, error_msg): def _warn_incorrect_partition_lib_set(self, lib_set, partition, error_msg):
for lib in lib_set.values(): for lib in lib_set.values():