Defer running of install_commands.Installed() until necessary

build/android/pylib/device/commands/install_commands.py

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..50f3940285c433353d93d59d951ec90761ecca0a 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,13 @@ exec app_process $base/bin %s $@
 
 
 def Installed(device):
-  return (all(device.FileExists('%s/%s' % (BIN_DIR, c)) for c in _COMMANDS)

[jbudorick, 2015/09/01 20:33:20]

If we think that FileExists doesn't handle the multiple-file case well enough,
I'd rather we either improve FileExists to support multiple files or create
another method to do the same than handroll a one-off.

[agrieve, 2015/09/02 15:34:49]

Done.

-          and device.FileExists('%s/chromium_commands.jar' % _FRAMEWORK_DIR))
+  cmd = 'test'
+  for c in _COMMANDS:
+    cmd += '-e %s -a' % posixpath.join(BIN_DIR, c)
+  cmd += '-e %s' % posixpath.join(_FRAMEWORK_DIR, 'chromium_commands.jar')
+  cmd += ' || echo 1'
+  return not device.RunShellCommand(cmd, check_return=True)
+
 
 def InstallCommands(device):
   if device.IsUserBuild():