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

Unverified Commit 83bfe5a0 authored by Christian Oder's avatar Christian Oder
Browse files

check_target_vintf: Properly glob Vintf file list 

Use the proper "**" glob to extract subdirectories as well as files.

The unzip-6.0-fix-recmatch patch shipped on distros like Fedora and ArchLinux
no longer extracts subdirectories when using "*", which breaks vintf checking
on those distros.

Test:
Manually run "unzip -o -q target_files.zip ODM/etc/**" and verify output
run sucessful build with vintf checks on ArchLinux (unzip 6.0-15)
and Ubuntu 20.04 (unzip 6.0-25ubuntu1)

Change-Id: I9e04fa36e071e11427fea89e7369dba8b9c5a4a1
parent edf3230c

tools/releasetools/check_target_files_vintf.py

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ def GetVintfFileList(): 
  """

  def PathToPatterns(path):

    if path[-1] == '/':

      path += '*'

      path += '**'



    # Loop over all the entries in DIR_SEARCH_PATHS and find one where the key

    # is a prefix of path. In order to get find the correct prefix, sort the