Merge "def-tool: Fix VNDK-SP warnings on APEX bionic"

This commit is contained in:
Logan Chien
2019-05-02 15:45:02 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
/system/${LIB}/libEGL.so:[regex]/vendor/${LIB}/egl/libEGL[A-Za-z0-9_-]*\.so
/system/${LIB}/libEGL.so:[regex]/vendor/${LIB}/egl/libGLES[A-Za-z0-9_-]*\.so
/system/${LIB}/libc.so:/system/${LIB}/libc_malloc_debug.so
/system/${LIB}/libc.so:/system/${LIB}/libicuuc.so
/system/${LIB}/libc.so:/system/${LIB}/libnetd_client.so
/apex/com.android.runtime/${LIB}/bionic/libc.so:/apex/com.android.runtime/${LIB}/libc_malloc_debug.so
/apex/com.android.runtime/${LIB}/bionic/libc.so:/apex/com.android.runtime/${LIB}/libicuuc.so
/apex/com.android.runtime/${LIB}/bionic/libc.so:/system/${LIB}/libnetd_client.so

View File

@@ -2200,6 +2200,7 @@ class ELFLinker(object):
def _rename_lib(self, lib, new_path):
self._remove_lib_from_lookup_dict(lib)
lib.path = new_path
lib._tag_bit = self.tagged_paths.get_path_tag_bit(new_path)
self._add_lib_to_lookup_dict(lib)