[Android] Add support for installing split apks with adb_install_apk.

build/android/pylib/utils/apk_helper.py

 # Copyright (c) 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.
 
 """Module containing utilities for apk packages."""
 
 import os.path
 import re
 
 from pylib import cmd_helper
 from pylib import constants
 
 
 _AAPT_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'aapt')
 _MANIFEST_ATTRIBUTE_RE = re.compile(
-    r'\s*A: ([^\(\)= ]*)\([^\(\)= ]*\)="(.*)" \(Raw: .*\)$')
+    r'\s*A: ([^\(\)= ]*)(\([^\(\)= ]*\))?="(.*)" \(Raw: .*\)$')

[mikecase (-- gone --), 2015/06/26 18:59:33]

This regex would previously only match attributes that had a pair of parenthesis
after the attribute name.

Would not match:
    A: package="com.example.package" (Raw: "com.example.package")

Would match:
    A: package()="com.example.package" (Raw: "com.example.package")

Needed to change this because I wanted to match these lines...
A: package="com.example.package" (Raw: "com.example.package")
A: split="example_split" (Raw: "example_split")

 _MANIFEST_ELEMENT_RE = re.compile(r'\s*(?:E|N): (\S*) .*$')
 
 
 def GetPackageName(apk_path):
   """Returns the package name of the apk."""
   return ApkHelper(apk_path).GetPackageName()
 
 
 # TODO(jbudorick): Deprecate and remove this function once callers have been
 # converted to ApkHelper.GetInstrumentationName
@@ skipping 25 matching lines @@
     if m:
       if not m.group(1) in node:
         node[m.group(1)] = {}
       node_stack += [node[m.group(1)]]
       continue
 
     m = _MANIFEST_ATTRIBUTE_RE.match(line[len(indent) * indent_depth:])
     if m:
       if not m.group(1) in node:
         node[m.group(1)] = []
-      node[m.group(1)].append(m.group(2))
+      node[m.group(1)].append(m.group(3))
       continue
 
   return parsed_manifest
 
 
 class ApkHelper(object):
   def __init__(self, apk_path):
     self._apk_path = apk_path
     self._manifest = None
-    self._package_name = None
 
   def GetActivityName(self):
     """Returns the name of the Activity in the apk."""
     manifest_info = self._GetManifest()
     try:
       activity = (
           manifest_info['manifest']['application']['activity']
               ['android:name'][0])
     except KeyError:
       return None
     if '.' not in activity:
       activity = '%s.%s' % (self.GetPackageName(), activity)
     elif activity.startswith('.'):
       activity = '%s%s' % (self.GetPackageName(), activity)
     return activity
 
   def GetInstrumentationName(
       self, default='android.test.InstrumentationTestRunner'):
     """Returns the name of the Instrumentation in the apk."""
     manifest_info = self._GetManifest()
     try:
       return manifest_info['manifest']['instrumentation']['android:name'][0]
     except KeyError:
       return default
 
   def GetPackageName(self):
     """Returns the package name of the apk."""
-    if self._package_name:
-      return self._package_name
+    manifest_info = self._GetManifest()

[jbudorick, 2015/06/26 23:26:59]

Why did we switch the implementation here? Does aapt dump badging not work for
splits?

[mikecase (-- gone --), 2015/06/27 00:21:22]

I changed this impl to be consistent with the rest of the class. All of the
other functions
in this class (GetInstrumentation, GetActivityName) get their info from the
manifest.
GetPackageName doesn't even though the package name is right in the manifest.

[jbudorick, 2015/06/29 15:49:01]

This was intentional. Parsing the output of aapt dump badging is substantially
faster than parsing the output of aapt dump xmltree.

[mikecase (-- gone --), 2015/06/29 20:06:21]

Changed GetPackageName back to old implementation. Use dump badging for
GetSplitName now. Added aapt wrapper. 

+    try:
+      return manifest_info['manifest']['package'][0]
+    except KeyError:
+      raise Exception('Failed to determine package name of %s' % self._apk_path)
 
-    aapt_cmd = [_AAPT_PATH, 'dump', 'badging', self._apk_path]
-    aapt_output = cmd_helper.GetCmdOutput(aapt_cmd).split('\n')
-    package_name_re = re.compile(r'package: .*name=\'(\S*)\'')
-    for line in aapt_output:
-      m = package_name_re.match(line)
-      if m:
-        self._package_name = m.group(1)
-        return self._package_name
-    raise Exception('Failed to determine package name of %s' % self._apk_path)
+  def GetSplitName(self):
+    """Returns the split attribute of the apk."""
+    manifest_info = self._GetManifest()
+    try:
+      return manifest_info['manifest']['split'][0]
+    except KeyError:
+      return None
 
   def _GetManifest(self):
     if not self._manifest:
       self._manifest = _ParseManifestFromApk(self._apk_path)
     return self._manifest