| Index: tools/chrome_remote_control/chrome_remote_control/adb_commands.py
|
| diff --git a/tools/chrome_remote_control/chrome_remote_control/adb_commands.py b/tools/chrome_remote_control/chrome_remote_control/adb_commands.py
|
| index 4fbf286b8b4ea4e73cf866d3ece9bf4d1e50eaaa..91c3709a4dad2f05d3a15ca4fbc5ce51b951cc1e 100644
|
| --- a/tools/chrome_remote_control/chrome_remote_control/adb_commands.py
|
| +++ b/tools/chrome_remote_control/chrome_remote_control/adb_commands.py
|
| @@ -17,27 +17,27 @@ sys.path.append(
|
| os.path.join(os.path.dirname(__file__),
|
| '../../../build/android')))
|
| try:
|
| - from pylib import android_commands as real_android_commands
|
| + from pylib import android_commands
|
| from pylib import forwarder
|
| from pylib import valgrind_tools
|
| except:
|
| - real_android_commands = None
|
| + android_commands = None
|
|
|
| def IsAndroidSupported():
|
| - return real_android_commands != None
|
| + return android_commands != None
|
|
|
| def GetAttachedDevices():
|
| """Returns a list of attached, online android devices.
|
|
|
| If a preferred device has been set with ANDROID_SERIAL, it will be first in
|
| the returned list."""
|
| - return real_android_commands.GetAttachedDevices()
|
| + return android_commands.GetAttachedDevices()
|
|
|
| class ADBCommands(object):
|
| """A thin wrapper around ADB"""
|
|
|
| def __init__(self, device):
|
| - self._adb = real_android_commands.AndroidCommands(device)
|
| + self._adb = android_commands.AndroidCommands(device)
|
|
|
| def Forward(self, local, remote):
|
| ret = self._adb._adb.SendCommand('forward %s %s' % (local, remote))
|
|
|