Add split-select logic to apk_install.py & fix crash when --split-apk-path is used

build/android/gyp/apk_install.py

Index: build/android/gyp/apk_install.py
diff --git a/build/android/gyp/apk_install.py b/build/android/gyp/apk_install.py
index 419dc170bb8e9066ba0d1fe9ae590808c0c797e5..bd5068e9c9068d3f3ac5bf6085dd95b472924102 100755
--- a/build/android/gyp/apk_install.py
+++ b/build/android/gyp/apk_install.py
@@ -23,6 +23,27 @@ sys.path.append(BUILD_ANDROID_DIR)
 from pylib import constants
 from pylib.utils import apk_helper
 
+def RetrieveDeviceConfig(device):
+  """Probes the given device for its split-select config.
+
+  For example: en-rUS-xhdpi:armeabi-v7a
+  Run "split-select --help" for more info about the format.
+  """
+  # The locale properties here are new in sdk level 21.
+  SHELL_CONFIG_COMMAND = ('echo $(getprop persist.sys.language)-'

[jbudorick, 2015/05/20 01:43:05]

This would seemingly be much more readable as just:

_DENSITIES = {
  120: 'ldpi', 
  160: 'mdpi',
  ...
}

def RetrieveDeviceConfig(device):
  language = device.GetProp('persist.sys.language')
  country = device.GetProp('persist.sys.country')
  density_px = int(device.GetProp('ro.sf.lcd_density')
  density = _DENSITIES.get(density_px, 'tvdpi')
  abi = device.product_cpi_api
  return '%s-%s-%s:%s' % (language, country, density, abi)

(not sure if this device is a DeviceUtils or a BuildDevice -- as written, this
assumes the former)

[jbudorick, 2015/05/20 01:44:05]

I should note that this is mildly slower than what you have, but given that this
is used while installing APKs, that effect is minimal.

[agrieve, 2015/05/20 14:33:58]

Yeah, this was my original reasoning, but seems fast enough this way.

[agrieve, 2015/05/20 14:33:58]

Done.

+      'r$(getprop persist.sys.country)-'
+      '$(D=$(getprop ro.sf.lcd_density);'
+      '  D=${D/120/ldpi};'
+      '  D=${D/160/mdpi};'
+      '  D=${D/240/hdpi};'
+      '  D=${D/320/xhdpi};'
+      '  D=${D/480/xxhdpi};'
+      '  D=${D/[0-9]*/tvdpi/};'
+      '  echo $D):'
+      '$(getprop ro.product.cpu.abi)')
+  return device.RunShellCommand(SHELL_CONFIG_COMMAND)[0]
+
+
 def GetNewMetadata(device, apk_package):
   """Gets the metadata on the device for the apk_package apk."""
   output = device.RunShellCommand('ls -l /data/app/')
@@ -62,6 +83,9 @@ def main():
       help='Path to .apk splits (can specify multiple times, causes '
       '--install-multiple to be used.',
       action='append')
+  parser.add_option('--android-sdk-tools',
+      help='Path to the Android SDK build tools folder. ' +
+           'Required when using --split-apk-path.')
   parser.add_option('--install-record',
       help='Path to install record (touched only when APK is installed).')
   parser.add_option('--build-device-configuration',
@@ -88,13 +112,36 @@ def main():
   # the build, then the APK has to be installed (regardless of the md5 record).
   force_install = HasInstallMetadataChanged(device, apk_package, metadata_path)
 
+  def SelectSplits(target_config, base_apk, split_apks, android_sdk_tools):
+    cmd = [os.path.join(android_sdk_tools, 'split-select'),
+           '--target', target_config,
+           '--base', base_apk,
+           ]
+    for split in split_apks:
+      cmd.extend(('--split', split))
+
+    # split-select outputs one path per line and a blank line at the end.
+    output = build_utils.CheckOutput(cmd)
+    return [x for x in output.split('\n') if x]
+
   def Install():
-    # TODO: Filter splits using split-select.
-    active_splits = options.split_apk_path
-    if active_splits:
-      device.adb.InstallMultiple(
-          [options.apk_path] + active_splits,
-          reinstall=True)
+    if options.split_apk_path:
+      requiredSdkVersion = constants.ANDROID_SDK_VERSION_CODES.LOLLIPOP
+      actualSdkVersion = device.device.build_version_sdk
+      if actualSdkVersion < requiredSdkVersion:
+        raise Exception(('--split-apk-path requires sdk version %s. Device has '
+                         'version %s') % (requiredSdkVersion, actualSdkVersion))
+      device_config = RetrieveDeviceConfig(device)
+      active_splits = SelectSplits(
+          device_config,
+          options.apk_path,
+          options.split_apk_path,
+          options.android_sdk_tools)
+
+      all_apks = [options.apk_path] + active_splits
+      apk_names = ', '.join((os.path.basename(path) for path in all_apks))
+      print 'Installing apks:', apk_names

[cjhopman, 2015/05/20 01:37:28]

maybe drop the print

[agrieve, 2015/05/20 14:33:58]

Done.

+      device.device.adb.InstallMultiple(all_apks, reinstall=True)
     else:
       device.Install(options.apk_path, reinstall=True)