Chromium Code Reviews| Index: build/android/gyp/generate_v14_compatible_resources.py |
| diff --git a/build/android/gyp/generate_v14_compatible_resources.py b/build/android/gyp/generate_v14_compatible_resources.py |
| index a22400ddaf53f986fc50c4429cb61fedee5fd540..967fc96791f5488a6575d8658942d8bcb0b535a8 100755 |
| --- a/build/android/gyp/generate_v14_compatible_resources.py |
| +++ b/build/android/gyp/generate_v14_compatible_resources.py |
| @@ -113,10 +113,14 @@ def ErrorIfStyleResourceExistsInDir(input_dir): |
| for input_filename in build_utils.FindInDirectory(input_dir, '*.xml'): |
| dom = ParseAndReportErrors(input_filename) |
| if HasStyleResource(dom): |
| - raise Exception('error: style file ' + input_filename + |
| - ' should be under ' + input_dir + |
| - '-v17 directory. Please refer to ' |
| - 'http://crbug.com/243952 for the details.') |
| + # Allow style file so long as it contains no deprecated attributes. |
| + if not 'third_party' in input_dir or ( |
|
cjhopman
2015/07/29 00:44:15
I'm not a big fan of this sort of hidden special c
agrieve
2015/07/29 01:55:01
The third_party check isn't strictly necessary, bu
|
| + GenerateV14StyleResourceDom(dom, input_filename, |
| + assert_not_deprecated=False)): |
| + raise Exception('error: style file ' + input_filename + |
| + ' should be under ' + input_dir + |
| + '-v17 directory. Please refer to ' |
| + 'http://crbug.com/243952 for the details.') |
| def GenerateV14LayoutResourceDom(dom, filename, assert_not_deprecated=True): |