GN(android): Use list of libraries rather than native_lib_dir in all places

build/android/gyp/apkbuilder.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2015 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.
 
 """Adds the code parts to a resource APK."""
 
 import argparse
 import itertools
@@ skipping 27 matching lines @@
                       help='Same as --assets, except disables compression.',
                       default='[]')
   parser.add_argument('--resource-apk',
                       help='An .ap_ file built using aapt',
                       required=True)
   parser.add_argument('--output-apk',
                       help='Path to the output file',
                       required=True)
   parser.add_argument('--dex-file',
                       help='Path to the classes.dex to use')
-  # TODO(agrieve): Switch this to be a list of files rather than a directory.
-  parser.add_argument('--native-libs-dir',
-                      help='Directory containing native libraries to include',
+  parser.add_argument('--native-libs',
+                      action='append',
+                      help='GYP-list of native libraries to include. '
+                           'Can be specified multiple times.',
                       default=[])
   parser.add_argument('--android-abi',
                       help='Android architecture to use for native libraries')
   parser.add_argument('--native-lib-placeholders',
                       help='GYP-list of native library placeholders to add.',
                       default='[]')
   parser.add_argument('--emma-device-jar',
                       help='Path to emma_device.jar to include.')
   options = parser.parse_args(args)
   options.assets = build_utils.ParseGypList(options.assets)
   options.uncompressed_assets = build_utils.ParseGypList(
       options.uncompressed_assets)
   options.native_lib_placeholders = build_utils.ParseGypList(
       options.native_lib_placeholders)
+  all_libs = []
+  for gyp_list in options.native_libs:
+    all_libs.extend(build_utils.ParseGypList(gyp_list))
+  options.native_libs = all_libs
 
-  if not options.android_abi and (options.native_libs_dir or
+  if not options.android_abi and (options.native_libs or
                                   options.native_lib_placeholders):
-    raise Exception('Must specify --android-abi with --native-libs-dir')
+    raise Exception('Must specify --android-abi with --native-libs')
   return options
 
 
-def _ListSubPaths(path):
-  """Returns a list of full paths to all files in the given path."""
-  return [os.path.join(path, name) for name in os.listdir(path)]
-
-
 def _SplitAssetPath(path):
   """Returns (src, dest) given an asset path in the form src[:dest]."""
   path_parts = path.split(':')
   src_path = path_parts[0]
   if len(path_parts) > 1:
     dest_path = path_parts[1]
   else:
     dest_path = os.path.basename(src_path)
   return src_path, dest_path
 
@@ skipping 28 matching lines @@
 
 def _CreateAssetsList(paths):
   """Returns a newline-separated list of asset paths for the given paths."""
   return '\n'.join(_SplitAssetPath(p)[1] for p in sorted(paths)) + '\n'
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   options = _ParseArgs(args)
 
-  native_libs = []
-  if options.native_libs_dir:
-    native_libs = _ListSubPaths(options.native_libs_dir)
-    native_libs.sort()
+  native_libs = sorted(options.native_libs)
 
   input_paths = [options.resource_apk, __file__] + native_libs
   if options.dex_file:
     input_paths.append(options.dex_file)
 
   if options.emma_device_jar:
     input_paths.append(options.emma_device_jar)
 
   input_strings = [options.android_abi, options.native_lib_placeholders]
 
@@ skipping 86 matching lines @@
   build_utils.CallAndWriteDepfileIfStale(
       on_stale_md5,
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=[options.output_apk])
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])