[android] Make profile_android_startup.py runnable on its own.

tools/cygprofile/profile_android_startup.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.
 
 """Utility library for running a startup profile on an Android device.
 
 Sets up a device for cygprofile, disables sandboxing permissions, and sets up
 support for web page replay, device forwarding, and fake certificate authority
 to make runs repeatable.
 """
 
+import argparse
 import logging
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 import time
 
 sys.path.append(os.path.join(sys.path[0], '..', '..',
     'third_party', 'catapult', 'devil'))
+from devil.android import apk_helper
 from devil.android import device_errors
 from devil.android import device_utils
 from devil.android import flag_changer
 from devil.android import forwarder
 from devil.android.sdk import intent
 
 sys.path.append(os.path.join(sys.path[0], '..', '..', 'build', 'android'))
+import devil_chromium
 from pylib import constants
 
 sys.path.append(os.path.join(sys.path[0], '..', '..', 'tools', 'perf'))
 from chrome_telemetry_build import chromium_config
 sys.path.append(chromium_config.GetTelemetryDir())
 from telemetry.internal.util import wpr_server
 
 sys.path.append(os.path.join(sys.path[0], '..', '..',
     'third_party', 'webpagereplay'))
 import adb_install_cert
@@ skipping 157 matching lines @@
 
   _DEVICE_CYGLOG_DIR = '/data/local/tmp/chrome/cyglog'
 
   # TEST_URL must be a url in the WPR_ARCHIVE.
   _TEST_URL = 'https://www.google.com/#hl=en&q=science'
   _WPR_ARCHIVE = os.path.join(
       constants.DIR_SOURCE_ROOT, 'tools', 'perf', 'page_sets', 'data',
       'top_10_mobile_002.wpr')
 
 
-  def __init__(self, output_directory):
+  def __init__(self, output_directory, host_cyglog_dir=None):

[pasko, 2017/01/04 14:17:24]

why do we need this be optional? is it hard to make it always require
host_cyglog_dir?

[jbudorick, 2017/01/04 15:11:52]

Doing so in this CL would break the downstream use of this. I'd need to land a
matching CL shortly after this rolled. I'd prefer a three-sided change if we
want this to be required.

[pasko, 2017/01/04 15:44:14]

OK, sure, please add a TODO to make this a mandatory argument after crbug/X is
fixed or something.

[jbudorick, 2017/01/04 17:08:51]

Done.

     devices = device_utils.DeviceUtils.HealthyDevices()
     self._device = devices[0]
     self._cygprofile_tests = os.path.join(
         output_directory, 'cygprofile_unittests')
-    self._host_cyglog_dir = os.path.join(
+    self._host_cyglog_dir = host_cyglog_dir or os.path.join(
         output_directory, 'cyglog_data')
     self._SetUpDevice()
 
   def RunCygprofileTests(self):
     """Run the cygprofile unit tests suite on the device.
 
     Args:
       path_to_tests: The location on the host machine with the compiled
                      cygprofile test binary.
     Returns:
@@ skipping 142 matching lines @@
     # Temporary workaround/investigation: if (for unknown reason) 'adb pull' of
     # the directory 'cyglog' into '.../Release/cyglog_data' produces
     # '...cyglog_data/cyglog/files' instead of the usual '...cyglog_data/files',
     # list the files deeper in the tree.
     cyglog_dir = self._host_cyglog_dir
     if (len(files) == 1) and (files[0] == 'cyglog'):
       cyglog_dir = os.path.join(self._host_cyglog_dir, 'cyglog')
       files = os.listdir(cyglog_dir)
 
     return [os.path.join(cyglog_dir, x) for x in files]
+
+
+def main(raw_args):
+  parser = argparse.ArgumentParser()
+  parser.add_argument(
+      '--adb-path', type=os.path.realpath,
+      help='adb binary')
+  parser.add_argument(
+      '--apk-path', type=os.path.realpath, required=True,
+      help='APK to profile')
+  parser.add_argument(
+      '--output-directory', type=os.path.realpath, required=True,
+      help='Chromium output directory (e.g. out/Release)')
+  parser.add_argument(
+      '--trace-directory', type=os.path.realpath,
+      help='Directory in which cyglog traces will be stored. '
+           'Defaults to <output-directory>/cyglog_data')
+
+  args = parser.parse_args(raw_args)

[pasko, 2017/01/04 14:17:24]

why not just parser.parse_args()?

[jbudorick, 2017/01/04 15:11:52]

This is a habit I've been getting into s.t. other things can call main if they'd
like, though in practice I've yet to do so.

Switched.

[pasko, 2017/01/04 15:44:14]

ah, ok. I'm probably from a different universe (C universe?), where calling
main() is heavily discouraged, so I did not think about this possibility.

+
+  devil_chromium.Initialize(
+      output_directory=args.output_directory, adb_path=args.adb_path)
+
+  apk = apk_helper.ApkHelper(args.apk_path)
+  package_info = None
+  for p in constants.PACKAGE_INFO.itervalues():
+    if p.package == apk.GetPackageName():
+      package_info = p
+      break
+  else:
+    raise Exception('Unable to determine package info for %s' % args.apk_path)
+
+  profiler = AndroidProfileTool(
+      args.output_directory, host_cyglog_dir=args.trace_directory)
+  profiler.CollectProfile(args.apk_path, package_info)
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))
+