Android bot changes for robustness, profiling, and debugging.

build/android/emulator.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Provides an interface to start and stop Android emulator.
 
 Assumes system environment ANDROID_NDK_ROOT has been set.
 
   Emulator: The class provides the methods to launch/shutdown the emulator with
             the android virtual device named 'buildbot' .
 """
 
 import logging
 import os
 import subprocess
 import sys
 
 import android_commands
 
+# adb_interface.py is under ../../third_party/android/testrunner/
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..',
+   '..', 'third_party', 'android', 'testrunner'))
+import adb_interface
+
 
 def _GetAvailablePort():
   """Returns an available TCP port for the console."""
   used_ports = []
   emulators = android_commands.GetEmulators()
   for emulator in emulators:
     used_ports.append(emulator.split('-')[1])
   # The port must be an even number between 5554 and 5584.
   for port in range(5554, 5585, 2):
     if str(port) not in used_ports:
@@ skipping 20 matching lines @@
     try:
       android_sdk_root = os.environ['ANDROID_SDK_ROOT']
     except KeyError:
       logging.critical('The ANDROID_SDK_ROOT must be set to run the test on '
                        'emulator.')
       raise
     self.emulator = os.path.join(android_sdk_root, 'tools', 'emulator')
     self.popen = None
     self.device = None
 
+  def Reset(self):
+    """Kill a running emulator.
+
+    May be needed if the test scripts stopped abnormally and an
+    emulator is left around."""
+    adb = adb_interface.AdbInterface()
+    logging.info('Killing any existing emulator.')
+    adb.SendCommand('emu kill')
+
   def Launch(self):
     """Launches the emulator and waits for package manager to startup.
 
     If fails, an exception will be raised.
     """
     port = _GetAvailablePort()
     self.device = "emulator-%d" % port
-    self.popen = subprocess.Popen(args=[self.emulator, '-avd', 'buildbot',
-                                        '-port', str(port)])
+    self.popen = subprocess.Popen(args=[
+        self.emulator,
+        # Speed up emulator launch by 40%.  Really.
+        '-no-boot-anim',
+        # The default /data size is 64M.
+        # That's not enough for 4 unit test bundles and their data.
+        '-partition-size', '256',
+        # Use a familiar name and port.
+        '-avd', 'buildbot',
+        '-port', str(port)])
     # This will not return until device's package manager starts up or an
     # exception is raised.
     android_commands.AndroidCommands(self.device, True)
 
   def Shutdown(self):
     """Shuts down the process started by launch."""
     self.popen.terminate()
 
 
 def main(argv):
   Emulator().launch()
 
 
 if __name__ == '__main__':
   main(sys.argv)