commit 3fd6c7a86317d4eda3e59fb2031fecce0c069953
author Daniel Erat <derat@chromium.org> Fri May 02 14:28:31 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue May 13 00:07:54 2014 +0000
tree 86a56096b8a15b075280c350494af2097d2afda8
parent 8161873389abb76828551e001beb5f8390abe823

chromite: Autodetect app_shell instead of using flag.

Remove deploy_chrome's app_shell staging flag and make it
instead automatically install only app_shell and related
resources when app_shell has been built but Chrome hasn't.

BUG=chromium:369659
TEST=did a build with the app_shell USE flag defined
CQ-DEPEND=I9650cea97d6d60262e104189a6c607ab3f4e151f

Change-Id: I399ed30f2e56790d6b61ec451dce0693ebc84d73
Reviewed-on: https://chromium-review.googlesource.com/198437
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 54ae272..07db833 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -104,7 +104,7 @@
 
     # Used to track whether deploying content_shell or chrome to a device.
     self.content_shell = False
-    self.copy_paths = chrome_util.GetCopyPaths(False)
+    self.copy_paths = chrome_util.GetCopyPaths('chrome')
     self.chrome_dir = _CHROME_DIR
 
   def _GetRemoteMountFree(self, remote_dir):
@@ -325,20 +325,29 @@
 
   def _CheckDeployType(self):
     if self.options.build_dir:
-      if os.path.exists(os.path.join(self.options.build_dir, 'system.unand')):
+      def BinaryExists(filename):
+        """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('system.unand'):
         # Unand Content shell deployment.
         self.content_shell = True
         self.options.build_dir = os.path.join(self.options.build_dir,
                                               'system.unand/chrome/')
         self.options.dostrip = False
         self.options.target_dir = _ANDROID_DIR
-        self.copy_paths = chrome_util.GetCopyPaths(True)
-      elif os.path.exists(os.path.join(self.options.build_dir,
-                                       'content_shell')) and not os.path.exists(
-          os.path.join(self.options.build_dir, 'chrome')):
-        # Content shell deployment
+        self.copy_paths = chrome_util.GetCopyPaths('content_shell')
+      elif BinaryExists('content_shell') and not BinaryExists('chrome'):
+        # Content shell deployment.
         self.content_shell = True
-        self.copy_paths = chrome_util.GetCopyPaths(True)
+        self.copy_paths = chrome_util.GetCopyPaths('content_shell')
+      elif BinaryExists('app_shell') and not BinaryExists('chrome'):
+        # app_shell deployment.
+        self.copy_paths = chrome_util.GetCopyPaths('app_shell')
+        # TODO(derat): Update _Deploy() and remove this after figuring out how
+        # app_shell should be executed.
+        self.options.startui = False
+
     elif self.options.local_pkg_path or self.options.gs_path:
       # Package deployment.
       pkg_path = self.options.local_pkg_path
@@ -362,7 +371,7 @@
       if self.content_shell:
         self.options.dostrip = False
         self.options.target_dir = _ANDROID_DIR
-        self.copy_paths = chrome_util.GetCopyPaths(True)
+        self.copy_paths = chrome_util.GetCopyPaths('content_shell')
         self.chrome_dir = _ANDROID_DIR
 
   def _PrepareStagingDir(self):