Allow third_party deps to use res/values/layout instead of res/values/layout-v17

build/android/gyp/generate_v14_compatible_resources.py

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..1a9e17b4c8effa01db01d30b61c767b7e69e89ec 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 in third_party to exist in non-v17 directories so long
+      # as they do not contain deprecated attributes.
+      if not 'third_party' in input_dir or (
+          GenerateV14StyleResourceDom(dom, input_filename)):
+        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):