Merge "Allow the include directive."

am: 0252d6e5cf

Change-Id: I25d955cad649ee1a10ceee0d15d55312ce3f9d4c
This commit is contained in:
Chih-hung Hsieh
2018-12-07 15:42:30 -08:00
committed by android-build-merger

View File

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