vndk-def: Remove "follow" from default action
This commit removes `follow` option from the default actions to handle
ineligible vndk and vndk-sp usages. We prefer to stop at ineligible
libs instead of pulling all ineligible dependencies.
Bug: 37867089
Test: libandroid.so is not tagged as vndk by default with sailfish images.
Change-Id: Iafeb27bb2c658fc07916517033fbedcc9cdd84eb
diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py
index 6f83b9b..02984f7 100755
--- a/vndk/tools/definition-tool/vndk_definition_tool.py
+++ b/vndk/tools/definition-tool/vndk_definition_tool.py
@@ -1279,8 +1279,8 @@
def compute_degenerated_vndk(self, sp_lib, generic_refs,
tagged_paths=None,
- action_ineligible_vndk_sp='follow,warn',
- action_ineligible_vndk='follow,warn'):
+ action_ineligible_vndk_sp='warn',
+ action_ineligible_vndk='warn'):
# Find LL-NDK and SP-NDK libs.
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)
@@ -1890,12 +1890,14 @@
parser.add_argument('--tag-file', help='lib tag file')
parser.add_argument(
- '--action-ineligible-vndk-sp', default='warn,follow',
- help='action when a sp-hal uses non-vndk-sp libs')
+ '--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,follow',
- help='action when a vendor lib/exe uses fwk-only libs')
+ '--action-ineligible-vndk', default='warn',
+ 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):
for lib in lib_set.values():
