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..b30b86a7ef10e551d159b82d0cc8012f6f078ab1 100644 |
--- a/build/android/pylib/device/commands/install_commands.py |
+++ b/build/android/pylib/device/commands/install_commands.py |
@@ -3,6 +3,7 @@ |
# found in the LICENSE file. |
import os |
+import posixpath |
from pylib import constants |
@@ -22,8 +23,10 @@ exec app_process $base/bin %s $@ |
def Installed(device): |
- return (all(device.FileExists('%s/%s' % (BIN_DIR, c)) for c in _COMMANDS) |
- and device.FileExists('%s/chromium_commands.jar' % _FRAMEWORK_DIR)) |
+ paths = [posixpath.join(BIN_DIR, c) for c in _COMMANDS] |
+ paths.append(posixpath.join(_FRAMEWORK_DIR, 'chromium_commands.jar')) |
+ return device.PathExists(paths) |
+ |
def InstallCommands(device): |
if device.IsUserBuild(): |