Merge "Accept the "file:(project:)?filePath" directive." am: cda227eeaf am: eb617633aa

am: aed44f5202

Change-Id: Iea6e1398817148ed5653832dc6b49b5f88b03270
This commit is contained in:
Chih-hung Hsieh 2019-03-13 14:13:27 -07:00 committed by android-build-merger
commit 8cdaee91cd
1 changed files with 3 additions and 2 deletions

View File

@ -52,12 +52,13 @@ def main():
noparent = 'set +noparent'
email = '([^@ ]+@[^ @]+|\\*)'
emails = '(%s( *, *%s)*)' % (email, email)
directive = '(%s|%s)' % (emails, noparent)
file_directive = 'file: *([^ :]+ *: *)?[^ ]+'
directive = '(%s|%s|%s)' % (emails, noparent, file_directive)
glob = '[a-zA-Z0-9_\\.\\-\\*\\?]+'
globs = '(%s( *, *%s)*)' % (glob, glob)
perfile = 'per-file +' + globs + ' *= *' + directive
include = 'include +([^ :]+ *: *)?[^ ]+'
pats = '(|%s|%s|%s|%s)$' % (noparent, email, perfile, include)
pats = '(|%s|%s|%s|%s|%s)$' % (noparent, email, perfile, include, file_directive)
patterns = re.compile(pats)
address_pattern = re.compile('([^@ ]+@[^ @]+)')
perfile_pattern = re.compile('per-file +.*=(.*)')