commit 9813f0edf0a9ca2c82822f51cb8f14218b95ee52
author Daniel Erat <derat@chromium.org> Wed Nov 12 11:00:28 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Nov 13 03:14:50 2014 +0000
tree 22886467a6fb146906213f44659ff88452327346
parent 2ad8de00e91673d0458717f1cd33e98cb698958c

deploy_chrome: Add envoy support.

BUG=chromium:426914
TEST=built chromeos-chrome with the envoy USE flag and
     checked that envoy_shell was installed; also updated
     deploy_chrome_unittest.py and verified that it still
     passes

Change-Id: Id8c2f857b19cfbf14effea8ca11db78fa2a0f225
Reviewed-on: https://chromium-review.googlesource.com/229431
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Daniel Erat <derat@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index 7500497..33d42aa 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -272,11 +272,15 @@
         """Checks if the passed-in file is present in the build directory."""
         return os.path.exists(os.path.join(self.options.build_dir, filename))
 
-      if BinaryExists('app_shell') and not BinaryExists('chrome'):
-        # app_shell deployment.
-        self.copy_paths = chrome_util.GetCopyPaths('app_shell')
+      # Handle non-Chrome deployments.
+      if not BinaryExists('chrome'):
+        if BinaryExists('envoy_shell'):
+          self.copy_paths = chrome_util.GetCopyPaths('envoy')
+        elif BinaryExists('app_shell'):
+          self.copy_paths = chrome_util.GetCopyPaths('app_shell')
+
         # TODO(derat): Update _Deploy() and remove this after figuring out how
-        # app_shell should be executed.
+        # {app,envoy}_shell should be executed.
         self.options.startui = False
 
   def _PrepareStagingDir(self):