diff --git a/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-current.txt b/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-current.txt index 80862c403..38d4bce4a 100644 --- a/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-current.txt +++ b/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-current.txt @@ -43,8 +43,3 @@ SP-HAL: [regex]^/vendor/.*/libGLESv3_.*\.so$ SP-HAL: [regex]^/vendor/.*/libPVRRS\.so$ SP-HAL: [regex]^/vendor/.*/libRSDriver.*\.so$ SP-HAL: [regex]^/vendor/.*/vulkan.*\.so$ - -# Workaround for degenerated VDNK -VNDK-SP-private: libartbase.so -VNDK-SP-private: libdexfile.so -VNDK-SP-private: libziparchive.so diff --git a/vndk/tools/definition-tool/tools/update_dataset.py b/vndk/tools/definition-tool/tools/update_dataset.py index 4c860624a..64a2bd10d 100755 --- a/vndk/tools/definition-tool/tools/update_dataset.py +++ b/vndk/tools/definition-tool/tools/update_dataset.py @@ -202,26 +202,6 @@ def main(): for name in libs: update_tag('/system/${LIB}/' + name + '.so', 'LL-NDK-Private') - # Workaround for extra VNDK-SP-Private. The extra VNDK-SP-Private shared - # libraries are VNDK-SP-Private when BOARD_VNDK_VERSION is set but are not - # VNDK-SP-Private when BOARD_VNDK_VERSION is set. - libs = [ - 'libdexfile', - ] - - prefix_core = '/system/${LIB}/' - prefix_vendor = '/system/${LIB}/vndk-sp${VNDK_VER}/' - - for name in libs: - assert name not in vndk_sp - assert name not in vndk_private - name = get_subdir_and_name(name, name_path_dict, prefix_core, - prefix_vendor) - update_tag(prefix_core + name, 'VNDK-SP-Private', - 'Workaround for degenerated VDNK') - update_tag(prefix_vendor + name, 'VNDK-SP-Private', - 'Workaround for degenerated VDNK') - # Workaround for libclang_rt.*.so lib_sets = { 'LL-NDK': llndk,