[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/platform/android_platform_backend.py

 # Copyright 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.
 
 import logging
 import os
 import posixpath
 import re
 import subprocess
 import tempfile
@@ skipping 29 matching lines @@
 from devil.android.perf import thermal_throttle
 from devil.android.sdk import version_codes
 from devil.android.tools import video_recorder
 
 try:
   from devil.android.perf import surface_stats_collector
 except Exception:
   surface_stats_collector = None
 
 
+_ARCH_TO_STACK_TOOL_ARCH = {
+  'armeabi-v7a': 'arm',
+  'arm64-v8a': 'arm64',
+}
 _DEVICE_COPY_SCRIPT_FILE = os.path.abspath(os.path.join(
     os.path.dirname(__file__), 'efficient_android_directory_copy.sh'))
 _DEVICE_COPY_SCRIPT_LOCATION = (
     '/data/local/tmp/efficient_android_directory_copy.sh')
 
 # TODO(nednguyen): Remove this method and update the client config to point to
 # the correct binary instead.
 def _FindLocallyBuiltPath(binary_name):
   """Finds the most recently built |binary_name|."""
   command = None
@@ skipping 448 matching lines @@
     This allows transparent HTTPS testing with WPR server without need
     to tweak application network stack.
 
     Note: If this method fails with any exception, then RemoveTestCa will be
     automatically called by the network_controller_backend.
     """
     if self._device_cert_util is not None:
       logging.warning('Test certificate authority is already installed.')
       return
     self._device_cert_util = adb_install_cert.AndroidCertInstaller(
-        self._device.adb.GetDeviceSerial(), None, ca_cert_path)
+        self._device.adb.GetDeviceSerial(), None, ca_cert_path,
+        adb_path=self._device.adb.GetAdbPath())
     self._device_cert_util.install_cert(overwrite_cert=True)
 
   def RemoveTestCa(self):
     """Remove root CA from device installed by InstallTestCa.
 
     Note: Any exceptions raised by this method will be logged but dismissed by
     the network_controller_backend.
     """
     if self._device_cert_util is not None:
       try:
@@ skipping 113 matching lines @@
       self._device.RunShellCommand(
           ['am', 'set-debug-app', '--persistent', package])
 
   def GetLogCat(self, number_of_lines=500):
     """Returns most recent lines of logcat dump.
 
     Args:
       number_of_lines: Number of lines of log to return.
     """
     return '\n'.join(self._device.RunShellCommand(
-        ['logcat', '-d', '-t', str(number_of_lines)]))
+        ['logcat', '-d', '-t', str(number_of_lines)],
+        check_return=True, large_output=True))
 
   def GetStandardOutput(self):
-    return None
+    return 'Cannot get standard output on Android'
 
   def GetStackTrace(self):
     """Returns stack trace.
 
     The stack trace consists of raw logcat dump, logcat dump with symbols,
     and stack info from tomstone files.
     """
     def Decorate(title, content):
       return "%s\n%s\n%s\n" % (title, content, '*' * 80)
 
     # Get the UI nodes that can be found on the screen
     ret = Decorate('UI dump', '\n'.join(self.GetSystemUi().ScreenDump()))
 
     # Get the last lines of logcat (large enough to contain stacktrace)
     logcat = self.GetLogCat()
     ret += Decorate('Logcat', logcat)
     stack = os.path.join(util.GetChromiumSrcDir(), 'third_party',
                          'android_platform', 'development', 'scripts', 'stack')
     # Try to symbolize logcat.
     if os.path.exists(stack):
       cmd = [stack]
-      cmd.append('--arch=%s' % self.GetArchName())
+      arch = self.GetArchName()
+      arch = _ARCH_TO_STACK_TOOL_ARCH.get(arch, arch)
+      cmd.append('--arch=%s' % arch)
       p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
       ret += Decorate('Stack from Logcat', p.communicate(input=logcat)[0])
 
     # Try to get tombstones.
     tombstones = os.path.join(util.GetChromiumSrcDir(), 'build', 'android',
                               'tombstones.py')
     if os.path.exists(tombstones):
       ret += Decorate('Tombstones',
                       subprocess.Popen([tombstones, '-w', '--device',
                                         self._device.adb.GetDeviceSerial()],
                                        stdout=subprocess.PIPE).communicate()[0])
     return (True, ret)
 
+  def GetMinidumpPath(self):
+    return None
+
   def IsScreenOn(self):
     """Determines if device screen is on."""
     return self._device.IsScreenOn()
 
   @staticmethod
   def _IsScreenLocked(input_methods):
     """Parser method for IsScreenLocked()
 
     Args:
       input_methods: Output from dumpsys input_methods
@@ skipping 41 matching lines @@
   for process in psutil.process_iter():
     try:
       if psutil.version_info >= (2, 0):
         if 'adb' in process.name():
           process.cpu_affinity([0])
       else:
         if 'adb' in process.name:
           process.set_cpu_affinity([0])
     except (psutil.NoSuchProcess, psutil.AccessDenied):
       logging.warn('Failed to set adb process CPU affinity')