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

Commit 5f470341 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Automerger Merge Worker
Browse files

Merge "[get_clang_version] Make the version regex permissive" am: 1b6a962b

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

Change-Id: I1160b69d52a337f99e458270e4cc3a25051417b4
parents 0a7e9a52 1b6a962b
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ def get_clang_prebuilts_version(global_go):
  with open(global_go) as infile:
  with open(global_go) as infile:
    contents = infile.read()
    contents = infile.read()


  regex_rev = r'\tClangDefaultVersion\s+= "(?P<rev>clang-r\d+[a-z]?\d?)"'
  regex_rev = r'\tClangDefaultVersion\s+= "(?P<rev>clang-.*)"'
  match_rev = re.search(regex_rev, contents)
  match_rev = re.search(regex_rev, contents)
  if match_rev is None:
  if match_rev is None:
    raise RuntimeError('Parsing clang info failed')
    raise RuntimeError('Parsing clang info failed')