[Android] Don't use zip pushing if not built or on user builds.

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 268052fbebfdd09fbafd70ca9f7dcab68fb925b7..30a9536b3d3a14ee2e20350ea0c4acb53f914936 100644
--- a/build/android/pylib/device/commands/install_commands.py
+++ b/build/android/pylib/device/commands/install_commands.py
@@ -22,10 +22,20 @@ exec app_process $base/bin %s $@
 
 
 def Installed(device):
-  return all(device.FileExists('%s/%s' % (BIN_DIR, c)) for c in _COMMANDS)
-
+  return (all(device.FileExists('%s/%s' % (BIN_DIR, c)) for c in _COMMANDS)
+          and device.FileExists('%s/chromium_commands.jar' % _FRAMEWORK_DIR))
 
 def InstallCommands(device):
+  if not device.IsUserBuild():

[jbudorick, 2014/10/14 18:28:49]

need to remove the not here, verifying locally then reuploading

+    raise Exception('chromium_commands currently requires a userdebug build.')
+
+  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)
+
   device.RunShellCommand(['mkdir', BIN_DIR, _FRAMEWORK_DIR])
   for command, main_class in _COMMANDS.iteritems():
     shell_command = _SHELL_COMMAND_FORMAT % (
@@ -36,8 +46,6 @@ def InstallCommands(device):
         ['chmod', '755', shell_file], check_return=True)
 
   device.adb.Push(
-      os.path.join(constants.GetOutDirectory(),
-                   constants.SDK_BUILD_JAVALIB_DIR,
-                   'chromium_commands.dex.jar'),
+      chromium_commands_jar_path,
       '%s/chromium_commands.jar' % _FRAMEWORK_DIR)