commit 5b7c2ed6fdae212f7f350d1156fccbfbe5201e2b
author Ryan Cui <rcui@chromium.org> Mon Mar 18 18:45:46 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue Mar 19 14:59:38 2013 -0700
tree 182ac9705ad825808c1ec5ad28d3623445edb1e8
parent 62806d18ba21291a751e51c1770bd4c5148bac40

deploy_chrome: polish strip functionality.

1. --strip-bin no longer normalizes the path.
2. Add --strip-flags to allow custom strip flags.  Used by the
   ebuild, but can also be used by developers.

BUG=None
TEST=Ran the ebuild.

Change-Id: Ib8d4b3a2e6ad7442860ef8aceecc77088819a902
Reviewed-on: https://gerrit.chromium.org/gerrit/45818
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
Commit-Queue: Ryan Cui <rcui@chromium.org>

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index b18c56e..213fa8f 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -23,6 +23,7 @@
 import multiprocessing
 import os
 import optparse
+import shlex
 import time
 
 
@@ -266,13 +267,16 @@
                    help='Path to local chrome prebuilt package to deploy.')
   group.add_option('--sloppy', action='store_true', default=False,
                    help='Ignore when mandatory artifacts are missing.')
+  group.add_option('--staging-flags', default=None, type='gyp_defines',
+                   help='Extra flags to control staging.  Valid flags are - %s'
+                        % ', '.join(chrome_util.STAGING_FLAGS))
   group.add_option('--strict', action='store_true', default=False,
                    help='Stage artifacts based on the GYP_DEFINES environment '
                         'variable and --staging-flags, if set. Enforce that '
                         'all optional artifacts are deployed.')
-  group.add_option('--staging-flags', default=None, type='gyp_defines',
-                   help='Extra flags to control staging.  Valid flags are - %s'
-                        % ', '.join(chrome_util.STAGING_FLAGS))
+  group.add_option('--strip-flags', default=None,
+                   help="Flags to call the 'strip' binutil tool with.  "
+                        "Overrides the default arguments.")
 
   parser.add_option_group(group)
 
@@ -289,11 +293,10 @@
   # Only prepare the staging directory, and skip deploying to the device.
   parser.add_option('--staging-only', action='store_true', default=False,
                     help=optparse.SUPPRESS_HELP)
-  # Path to a binutil 'strip' tool to strip binaries with.  Used by the Chrome
-  # ebuild to skip fetching the SDK toolchain.
-  parser.add_option('--strip-bin', type='path', default=None,
-                    help=optparse.SUPPRESS_HELP)
-
+  # Path to a binutil 'strip' tool to strip binaries with.  The passed-in path
+  # is used as-is, and not normalized.  Used by the Chrome ebuild to skip
+  # fetching the SDK toolchain.
+  parser.add_option('--strip-bin', default=None, help=optparse.SUPPRESS_HELP)
   return parser
 
 
@@ -410,10 +413,13 @@
   """
   if options.build_dir:
     with _StripBinContext(options) as strip_bin:
+      strip_flags = (None if options.strip_flags is None else
+                     shlex.split(options.strip_flags))
       chrome_util.StageChromeFromBuildDir(
           staging_dir, options.build_dir, strip_bin, strict=options.strict,
           sloppy=options.sloppy, gyp_defines=options.gyp_defines,
-          staging_flags=options.staging_flags)
+          staging_flags=options.staging_flags,
+          strip_flags=strip_flags)
   else:
     pkg_path = options.local_pkg_path
     if options.gs_path: