diff options
Diffstat (limited to 'catapult/devil/devil/android/install_commands.py')
| -rw-r--r-- | catapult/devil/devil/android/install_commands.py | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/catapult/devil/devil/android/install_commands.py b/catapult/devil/devil/android/install_commands.py index c8da8696..c87fc9bd 100644 --- a/catapult/devil/devil/android/install_commands.py +++ b/catapult/devil/devil/android/install_commands.py @@ -13,11 +13,10 @@ BIN_DIR = '%s/bin' % file_system.TEST_EXECUTABLE_DIR _FRAMEWORK_DIR = '%s/framework' % file_system.TEST_EXECUTABLE_DIR _COMMANDS = { - 'unzip': 'org.chromium.android.commands.unzip.Unzip', + 'unzip': 'org.chromium.android.commands.unzip.Unzip', } -_SHELL_COMMAND_FORMAT = ( -"""#!/system/bin/sh +_SHELL_COMMAND_FORMAT = ("""#!/system/bin/sh base=%s export CLASSPATH=$base/framework/chromium_commands.jar exec app_process $base/bin %s $@ @@ -39,19 +38,17 @@ def InstallCommands(device): chromium_commands_jar_path = devil_env.config.FetchPath('chromium_commands') if not os.path.exists(chromium_commands_jar_path): raise device_errors.CommandFailedError( - '%s not found. Please build chromium_commands.' - % chromium_commands_jar_path) + '%s not found. Please build chromium_commands.' % + chromium_commands_jar_path) - device.RunShellCommand( - ['mkdir', '-p', BIN_DIR, _FRAMEWORK_DIR], check_return=True) + device.RunShellCommand(['mkdir', '-p', BIN_DIR, _FRAMEWORK_DIR], + check_return=True) for command, main_class in _COMMANDS.iteritems(): - shell_command = _SHELL_COMMAND_FORMAT % ( - file_system.TEST_EXECUTABLE_DIR, main_class) + shell_command = _SHELL_COMMAND_FORMAT % (file_system.TEST_EXECUTABLE_DIR, + main_class) shell_file = '%s/%s' % (BIN_DIR, command) device.WriteFile(shell_file, shell_command) - device.RunShellCommand( - ['chmod', '755', shell_file], check_return=True) + device.RunShellCommand(['chmod', '755', shell_file], check_return=True) - device.adb.Push( - chromium_commands_jar_path, - '%s/chromium_commands.jar' % _FRAMEWORK_DIR) + device.adb.Push(chromium_commands_jar_path, + '%s/chromium_commands.jar' % _FRAMEWORK_DIR) |