diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 21:31:44 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 21:31:44 +0000 |
| commit | c8dc7e65f3f423a176d408a3e2dd952ed84c9f0f (patch) | |
| tree | 10b41f101952a44e1345928e032f10b352396bf0 /chrome | |
| parent | 725c68279789e7a3a7726e5a1a919aa2aae27f07 (diff) | |
| download | chromium_src-c8dc7e65f3f423a176d408a3e2dd952ed84c9f0f.zip chromium_src-c8dc7e65f3f423a176d408a3e2dd952ed84c9f0f.tar.gz chromium_src-c8dc7e65f3f423a176d408a3e2dd952ed84c9f0f.tar.bz2 | |
Add _NXArgc and _NXArgv to the list of symbols saved (not stripped) in the
main executable. Fix a bug preventing the list of saved symbols from being
consulted during stripping in Breakpad-enabled builds.
BUG=87646
TEST=Run the relaunch tests, as in r90371
Review URL: http://codereview.chromium.org/7277012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/app.saves | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/chrome/app/app.saves b/chrome/app/app.saves index 252f544..8ae1b93 100644 --- a/chrome/app/app.saves +++ b/chrome/app/app.saves @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -6,3 +6,5 @@ # helper app executables. _main +_NXArgc +_NXArgv diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9c1c272..60d94f6 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1050,6 +1050,11 @@ # A real .dSYM is needed for dump_syms to operate on. 'mac_real_dsym': 1, }, + 'xcode_settings': { + # With mac_real_dsym set, strip_from_xcode won't be used. + # Specify CHROMIUM_STRIP_SAVE_FILE directly to Xcode. + 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)', + }, }], ], }, # target helper_app diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 238779f..6ab3910 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -269,6 +269,11 @@ # A real .dSYM is needed for dump_syms to operate on. 'mac_real_dsym': 1, }, + 'xcode_settings': { + # With mac_real_dsym set, strip_from_xcode won't be used. + # Specify CHROMIUM_STRIP_SAVE_FILE directly to Xcode. + 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)', + }, 'dependencies': [ '../breakpad/breakpad.gyp:dump_syms', '../breakpad/breakpad.gyp:symupload', |