GN: Side-load dex files as well as native code in incremental installs

build/android/incremental_install/generate_android_manifest.py

Index: build/android/incremental_install/generate_android_manifest.py
diff --git a/build/android/incremental_install/generate_android_manifest.py b/build/android/incremental_install/generate_android_manifest.py
new file mode 100755
index 0000000000000000000000000000000000000000..6545311b4d234bfbb4307975b394c5b26cce3268
--- /dev/null
+++ b/build/android/incremental_install/generate_android_manifest.py
@@ -0,0 +1,95 @@
+#!/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.
+"""Creates an AndroidManifest.xml for an incremental APK.
+
+Given the manifest file for the real APK, generates an AndroidManifest.xml with
+the application class changed to IncrementalApplication.
+"""
+
+import argparse
+import os
+import sys
+from xml.etree import ElementTree
+
+sys.path.append(os.path.join(os.path.dirname(__file__), os.path.pardir, 'gyp'))
+from util import build_utils
+
+_ANDROID_NAMESPACE = 'http://schemas.android.com/apk/res/android'
+ElementTree.register_namespace('android', _ANDROID_NAMESPACE)
+
+_INCREMENTAL_APP_NAME = 'org.chromium.incrementalinstall.BootstrapApplication'
+_META_DATA_NAME = 'incremental-install-real-app'
+
+
+def _AddNamespace(name):
+  """Adds the android namespace prefix to the given identifier."""
+  return '{%s}%s' % (_ANDROID_NAMESPACE, name)
+
+def _ParseArgs():
+  parser = argparse.ArgumentParser()
+  build_utils.AddDepfileOption(parser)
+  parser.add_argument('--src-manifest',
+                      help='The main manifest of the app',
+                      required=True)
+  parser.add_argument('--out-manifest',
+                      help='The output manifest',
+                      required=True)
+  parser.add_argument('--disable-isolated-processes',

[jbudorick, 2015/09/15 18:36:41]

When would we use this?

[agrieve, 2015/09/15 19:30:05]

Required for Android M (added to help text).

+                      help='Changes all android:isolatedProcess to false',
+                      action='store_true')
+  return parser.parse_args()
+
+
+def _ProcessManifest(main_manifest, main_manifest_path,
+                    disable_isolated_processes):

[jbudorick, 2015/09/15 18:36:41]

nit: indentation

[agrieve, 2015/09/15 19:30:05]

Done.

+  """Returns a transformed AndroidManifest.xml for use with _incremental apks.
+
+  Args:
+    main_manifest: Manifest contents to transform.
+    main_manifest_path: Path to main_manifest (used for error messages).
+    disable_isolated_processes: Whether to set all isolatedProcess attributes to
+        false
+
+  Returns:
+    The transformed AndroidManifest.xml.
+  """
+  if disable_isolated_processes:
+    main_manifest = main_manifest.replace('isolatedProcess="true"',
+                                          'isolatedProcess="false"')
+
+  doc = ElementTree.fromstring(main_manifest)
+  app_node = doc.find('application')
+  if app_node is None:
+    raise Exception('Could not find <application> in %s' % main_manifest_path)
+  real_app_class = app_node.get(_AddNamespace('name'))
+  if real_app_class is None:
+    raise Exception('Could not find android:name in <application> in %s' %
+                    main_manifest_path)
+  app_node.set(_AddNamespace('name'), _INCREMENTAL_APP_NAME)
+
+  meta_data_node = ElementTree.SubElement(app_node, 'meta-data')
+  meta_data_node.set(_AddNamespace('name'), _META_DATA_NAME)
+  meta_data_node.set(_AddNamespace('value'), real_app_class)
+  return ElementTree.tostring(doc, encoding='UTF-8')
+
+
+def main():
+  options = _ParseArgs()
+  with open(options.src_manifest) as f:
+    main_manifest_data = f.read()
+  new_manifest_data = _ProcessManifest(main_manifest_data, options.src_manifest,
+                                       options.disable_isolated_processes)
+  with open(options.out_manifest, 'w') as f:
+    f.write(new_manifest_data)
+
+  if options.depfile:
+    build_utils.WriteDepfile(
+        options.depfile,
+        [options.src_manifest] + build_utils.GetPythonDependencies())
+
+
+if __name__ == '__main__':
+  main()