Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3126)

Unified Diff: build/android/pylib/device/commands/install_commands.py

Issue 1325893002: Defer running of install_commands.Installed() until necessary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@device2
Patch Set: review nit Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/devil/android/device_utils_test.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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():
« no previous file with comments | « build/android/devil/android/device_utils_test.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698