[Android] Skip generating v14 resources if already a version is specified.

build/android/gyp/generate_v14_compatible_resources.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Convert Android xml resources to API 14 compatible.
 
 There are two reasons that we cannot just use API 17 attributes,
 so we are generating another set of resources by this script.
 
 1. paddingStart attribute can cause a crash on Galaxy Tab 2.
 2. There is a bug that paddingStart does not override paddingLeft on
    JB-MR1. This is fixed on JB-MR2.
 
 Therefore, this resource generation script can be removed when
 we drop the support for JB-MR1.
 
 Please refer to http://crbug.com/235118 for the details.
 """
 
 import optparse
 import os
+import re
 import shutil
 import sys
 import xml.dom.minidom as minidom
 
 from util import build_utils
 
 # Note that we are assuming 'android:' is an alias of
 # the namespace 'http://schemas.android.com/apk/res/android'.
 
 GRAVITY_ATTRIBUTES = ('android:gravity', 'android:layout_gravity')
@@ skipping 200 matching lines @@
   build_utils.MakeDirectory(options.res_v14_compatibility_dir)
 
   for name in os.listdir(options.res_dir):
     if not os.path.isdir(os.path.join(options.res_dir, name)):
       continue
 
     dir_pieces = name.split('-')
     resource_type = dir_pieces[0]
     qualifiers = dir_pieces[1:]
 
+    api_version_qualifier_index = -1

[newt (away), 2013/06/07 04:24:09]

super minor nit: "api_level"

[Kibeom Kim (inactive), 2013/06/07 05:07:19]

Done.

+    api_version_qualifier = ''
+    for index, qualifier in enumerate(qualifiers):
+      if re.match('\Av[0-9]+$', qualifier):

[newt (away), 2013/06/07 04:24:09]

"^" instead of "\A" for familiarity and consistency. ("\A" is only needed for
multiline matches). Or you could remove it altogether since re.match() only
matches at the beginning of the string -- so, "^" is actually redundant.

[Kibeom Kim (inactive), 2013/06/07 05:07:19]

Done.

+        api_version_qualifier_index = index
+        api_version_qualifier = qualifier
+        break
+
     # Android pre-v17 API doesn't support RTL. Skip.
     if 'ldrtl' in qualifiers:
       continue
 
     # We also need to copy the original v17 resource to *-v17 directory
     # because the generated v14 resource will hide the original resource.
     input_dir = os.path.join(options.res_dir, name)
     output_v14_dir = os.path.join(options.res_v14_compatibility_dir, name)
     output_v17_dir = os.path.join(options.res_v14_compatibility_dir, name +
                                                                      '-v17')
 
     # We only convert layout resources under layout*/, xml*/,
     # and style resources under values*/.
     # TODO(kkimlabs): don't process xml directly once all layouts have

[newt (away), 2013/06/07 04:24:09]

you can probably remove this TODO, since we decided that we should always
process the xml directory, even after the layouts are all moved.

[Kibeom Kim (inactive), 2013/06/07 05:07:19]

Done.

     # been moved out of XML directory. see http://crbug.com/238458
     if resource_type in ('layout', 'xml'):
-      GenerateV14LayoutResourcesInDir(input_dir, output_v14_dir, output_v17_dir)
+      if not api_version_qualifier:
+        GenerateV14LayoutResourcesInDir(input_dir, output_v14_dir,
+                                        output_v17_dir)
     elif resource_type == 'values':
-      if 'v17' in qualifiers:
+      if api_version_qualifier == 'v17':
         output_qualifiers = qualifiers[:]
-        del output_qualifiers[qualifiers.index('v17')]
+        del output_qualifiers[api_version_qualifier_index]
         output_v14_dir = os.path.join(options.res_v14_compatibility_dir,
                                       '-'.join([resource_type] +
                                                output_qualifiers))
         GenerateV14StyleResourcesInDir(input_dir, output_v14_dir)
-      else:
+      elif not api_version_qualifier:
         ErrorIfStyleResourceExistsInDir(input_dir)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))