| Index: build/android/pylib/device/commands/install_commands.py
|
| diff --git a/build/android/pylib/device/commands/install_commands.py b/build/android/pylib/device/commands/install_commands.py
|
| index 58c56ccb1be2900515c8d848879600c4b98e8385..62f8cb9d3ef525a5eb6e70d43792cc051b96d2c2 100644
|
| --- a/build/android/pylib/device/commands/install_commands.py
|
| +++ b/build/android/pylib/device/commands/install_commands.py
|
| @@ -4,6 +4,7 @@
|
|
|
| import os
|
|
|
| +from devil.android import device_errors
|
| from pylib import constants
|
|
|
| BIN_DIR = '%s/bin' % constants.TEST_EXECUTABLE_DIR
|
| @@ -27,14 +28,17 @@ def Installed(device):
|
|
|
| def InstallCommands(device):
|
| if device.IsUserBuild():
|
| - raise Exception('chromium_commands currently requires a userdebug build.')
|
| + raise device_errors.CommandFailedError(
|
| + 'chromium_commands currently requires a userdebug build.',
|
| + device_serial=device.GetDeviceSerial())
|
|
|
| chromium_commands_jar_path = os.path.join(
|
| constants.GetOutDirectory(), constants.SDK_BUILD_JAVALIB_DIR,
|
| 'chromium_commands.dex.jar')
|
| if not os.path.exists(chromium_commands_jar_path):
|
| - raise Exception('%s not found. Please build chromium_commands.'
|
| - % chromium_commands_jar_path)
|
| + raise device_errors.CommandFailedError(
|
| + '%s not found. Please build chromium_commands.'
|
| + % chromium_commands_jar_path)
|
|
|
| device.RunShellCommand(['mkdir', BIN_DIR, _FRAMEWORK_DIR])
|
| for command, main_class in _COMMANDS.iteritems():
|
|
|