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

build/android/incremental_install/installer.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 """Install *_incremental.apk targets as well as their dependent files."""
 
 import argparse
 import glob
 import logging
 import os
 import posixpath
-import shutil
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
 from devil.android import apk_helper
 from devil.android import device_utils
 from devil.android import device_errors
 from devil.android.sdk import version_codes
 from devil.utils import reraiser_thread
 from pylib import constants
 from pylib.utils import run_tests_helper
@@ skipping 33 matching lines @@
 
 def Uninstall(device, package):
   """Uninstalls and removes all incremental files for the given package."""
   main_timer = time_profile.TimeProfile()
   device.Uninstall(package)
   device.RunShellCommand(['rm', '-rf', _GetDeviceIncrementalDir(package)],
                          check_return=True)
   logging.info('Uninstall took %s seconds.', main_timer.GetDelta())
 
 
-def Install(device, apk, split_globs=None, lib_dir=None, dex_files=None,
+def Install(device, apk, split_globs=None, native_libs=None, dex_files=None,
             enable_device_cache=True, use_concurrency=True,
             show_proguard_warning=False):
   """Installs the given incremental apk and all required supporting files.
 
   Args:
     device: A DeviceUtils instance.
     apk: The path to the apk, or an ApkHelper instance.
     split_globs: Glob patterns for any required apk splits (optional).
-    lib_dir: Directory containing the app's native libraries (optional).
+    native_libs: List of app's native libraries (optional).
     dex_files: List of .dex.jar files that comprise the app's Dalvik code.
     enable_device_cache: Whether to enable on-device caching of checksums.
     use_concurrency: Whether to speed things up using multiple threads.
     show_proguard_warning: Whether to print a warning about Proguard not being
         enabled after installing.
   """
   main_timer = time_profile.TimeProfile()
   install_timer = time_profile.TimeProfile()
   push_native_timer = time_profile.TimeProfile()
   push_dex_timer = time_profile.TimeProfile()
@@ skipping 10 matching lines @@
       for split_glob in split_globs:
         splits.extend((f for f in glob.glob(split_glob)))
       device.InstallSplitApk(apk, splits, reinstall=True,
                              allow_cached_props=True, permissions=())
     else:
       device.Install(apk, reinstall=True, permissions=())
     install_timer.Stop(log=False)
 
   # Push .so and .dex files to the device (if they have changed).
   def do_push_files():
-    if lib_dir:
+    if native_libs:
       push_native_timer.Start()
-      device_lib_dir = posixpath.join(device_incremental_dir, 'lib')
-      device.PushChangedFiles([(lib_dir, device_lib_dir)],
-                              delete_device_stale=True)
+      with build_utils.TempDir() as temp_dir:
+        device_lib_dir = posixpath.join(device_incremental_dir, 'lib')
+        for path in native_libs:
+          os.symlink(path, os.path.join(temp_dir, os.path.basename(path)))
+        device.PushChangedFiles([(temp_dir, device_lib_dir)],
+                                delete_device_stale=True)
       push_native_timer.Stop(log=False)
 
     if dex_files:
       push_dex_timer.Start()
       # Put all .dex files to be pushed into a temporary directory so that we
       # can use delete_device_stale=True.
       with build_utils.TempDir() as temp_dir:
         device_dex_dir = posixpath.join(device_incremental_dir, 'dex')
         # Ensure no two files have the same name.
         transformed_names = _TransformDexPaths(dex_files)
         for src_path, dest_name in zip(dex_files, transformed_names):
-          shutil.copyfile(src_path, os.path.join(temp_dir, dest_name))
+          os.symlink(src_path, os.path.join(temp_dir, dest_name))
         device.PushChangedFiles([(temp_dir, device_dex_dir)],
                                 delete_device_stale=True)
       push_dex_timer.Stop(log=False)
 
   def check_selinux():
     # Marshmallow has no filesystem access whatsoever. It might be possible to
     # get things working on Lollipop, but attempts so far have failed.
     # http://crbug.com/558818
     has_selinux = device.build_version_sdk >= version_codes.LOLLIPOP
     if has_selinux and apk.HasIsolatedProcesses():
@@ skipping 59 matching lines @@
 
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('apk_path',
                       help='The path to the APK to install.')
   parser.add_argument('--split',
                       action='append',
                       dest='splits',
                       help='A glob matching the apk splits. '
                            'Can be specified multiple times.')
-  parser.add_argument('--lib-dir',
-                      help='Path to native libraries directory.')
-  parser.add_argument('--dex-files',
-                      help='List of dex files to push.',
+  parser.add_argument('--native_lib',
+                      dest='native_libs',
+                      help='Path to native library (repeatable)',
+                      action='append',
+                      default=[])
+  parser.add_argument('--dex-file',
+                      dest='dex_files',
+                      help='Path to dex files (repeatable)',
                       action='append',
                       default=[])
   parser.add_argument('-d', '--device', dest='device',
                       help='Target device for apk to install on.')
   parser.add_argument('--uninstall',
                       action='store_true',
                       default=False,
                       help='Remove the app and all side-loaded files.')
   parser.add_argument('--output-directory',
                       help='Path to the root build directory.')
@@ skipping 45 matching lines @@
              'Available devices:\n')
       descriptions = all_devices.pMap(lambda d: d.build_description).pGet(None)
       for d, desc in zip(devices, descriptions):
         msg += '  %s (%s)\n' % (d, desc)
       raise Exception(msg)
 
   apk = apk_helper.ToHelper(args.apk_path)
   if args.uninstall:
     Uninstall(device, apk.GetPackageName())
   else:
-    Install(device, apk, split_globs=args.splits, lib_dir=args.lib_dir,
+    Install(device, apk, split_globs=args.splits, native_libs=args.native_libs,
             dex_files=args.dex_files, enable_device_cache=args.cache,
             use_concurrency=args.threading,
             show_proguard_warning=args.show_proguard_warning)
 
 
 if __name__ == '__main__':
   sys.exit(main())