Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95f970cc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash in check_elf_file.py" am: ecf75cd3 am: c7c2dde5 am: 4a2cc299 

Original change: https://android-review.googlesource.com/c/platform/build/+/2296277



Change-Id: I58aaac51d8d9a42b2cd813c2c59089fd5f0f4a97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32fee922 4a2cc299

tools/check_elf_file.py

+4 −7
Original line number Diff line number Diff line
@@ -407,8 +407,7 @@ class Checker(object): 
    # Chech whether all DT_NEEDED entries are specified.

    for lib in self._file_under_test.dt_needed:

      if lib not in specified_sonames:

        self._error('DT_NEEDED "{}" is not specified in shared_libs.'

                    .format(lib.decode('utf-8')))

        self._error(f'DT_NEEDED "{lib}" is not specified in shared_libs.')

        missing_shared_libs = True



    if missing_shared_libs:
@@ -471,16 +470,14 @@ class Checker(object): 


    if missing_symbols:

      for sym, ver in sorted(missing_symbols):

        sym = sym.decode('utf-8')

        if ver:

          sym += '@' + ver.decode('utf-8')

        self._error('Unresolved symbol: {}'.format(sym))

          sym += '@' + ver

        self._error(f'Unresolved symbol: {sym}')



      self._note()

      self._note('Some dependencies might be changed, thus the symbol(s) '

                 'above cannot be resolved.')

      self._note('Please re-build the prebuilt file: "{}".'

                 .format(self._file_path))

      self._note(f'Please re-build the prebuilt file: "{self._file_path}".')



      self._note()

      self._note('If this is a new prebuilt file and it is designed to have '