Android: fixes emulator support in unit test scripts.

build/android/pylib/utils/emulator.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
@@ skipping 195 matching lines @@
     logging.info('Create AVD command: %s', ' '.join(avd_command))
     return self.avd_name
 
   def _DeleteAVD(self):
     """Delete the AVD of this emulator."""
     avd_command = [
         self.android,
         '--silent',
         'delete',
         'avd',
-        '--name', self.avd,
+        '--name', self.avd_name,

[navabi, 2013/04/08 20:11:48]

Good catch. thanks.

     ]
     avd_process = subprocess.Popen(args=avd_command,
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
     logging.info('Delete AVD command: %s', ' '.join(avd_command))
     avd_process.wait()
 
   def Launch(self, kill_all_emulators):
     """Launches the emulator asynchronously. Call ConfirmLaunch() to ensure the
     emulator is ready for use.
@@ skipping 99 matching lines @@
     logging.critical('emulator _ShutdownOnSignal')
     for sig in self._SIGNALS:
       signal.signal(sig, signal.SIG_DFL)
     self.Shutdown()
     raise KeyboardInterrupt  # print a stack
 
   def _InstallKillHandler(self):
     """Install a handler to kill the emulator when we exit unexpectedly."""
     for sig in self._SIGNALS:
       signal.signal(sig, self._ShutdownOnSignal)