Fix android resources in gn builds

build/android/gyp/package_resources.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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.
 
 # pylint: disable=C0301
 """Package resources into an apk.
 
 See https://android.googlesource.com/platform/tools/base/+/master/legacy/ant-tasks/src/main/java/com/android/ant/AaptExecTask.java
@@ skipping 84 matching lines @@
 
 def PackageArgsForExtractedZip(d):
   """Returns the aapt args for an extracted resources zip.
 
   A resources zip either contains the resources for a single target or for
   multiple targets. If it is multiple targets merged into one, the actual
   resource directories will be contained in the subdirectories 0, 1, 2, ...
   """
   res_dirs = []
   subdirs = [os.path.join(d, s) for s in os.listdir(d)]
-  subdirs = sorted([s for s in subdirs if os.path.isdir(s)])
-  if subdirs and os.path.basename(subdirs[0]) == '0':
-    res_dirs = subdirs
+  subdirs = [s for s in subdirs if os.path.isdir(s)]
+  is_multi = True
+  for s in subdirs:

[newt (away), 2015/03/13 23:13:45]

How about just checking if 0 is present, like before?

    is_multi = '0' in [os.path.basename(s) for s in subdirs]

[cjhopman, 2015/03/16 20:04:53]

Done.

+    try:
+      float(os.path.basename(s))

[newt (away), 2015/03/13 23:13:45]

why float and not int?

[cjhopman, 2015/03/16 20:04:53]

Done.

+    except ValueError:
+      is_multi = False
+      break
+
+  if is_multi:
+    res_dirs = sorted(subdirs, key=lambda p : float(os.path.basename(p)))
   else:
     res_dirs = [d]
   package_command = []
   for d in res_dirs:
     MoveImagesToNonMdpiFolders(d)
     package_command += ['-S', d]
   return package_command
 
 
 def main():
@@ skipping 40 matching lines @@
         package_command, print_stdout=False, print_stderr=False)
 
     if options.depfile:
       build_utils.WriteDepfile(
           options.depfile,
           build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   main()