summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:46:06 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:46:06 +0000
commitc39df1be83805795e884c691344daf5bde4c9ab2 (patch)
treebfdaa1027e69b9403f9be29017cbf5aa2ea9c95c /chrome
parente2f7713807ec4472db71cabcb0cfa0f03a902e72 (diff)
downloadchromium_src-c39df1be83805795e884c691344daf5bde4c9ab2.zip
chromium_src-c39df1be83805795e884c691344daf5bde4c9ab2.tar.gz
chromium_src-c39df1be83805795e884c691344daf5bde4c9ab2.tar.bz2
Don't strip main from the browser or helper app executables. This helps
backtraces of stripped executables look more reasonable. BUG=39232 TEST=gdb backtrace in a stripped executable with no symbols loaded should show thread 0 beginning in main Review URL: http://codereview.chromium.org/1460001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/app.saves8
-rw-r--r--chrome/app/chrome_exe_main.mm1
-rw-r--r--chrome/chrome.gyp1
-rw-r--r--chrome/chrome_dll.gypi1
-rw-r--r--chrome/chrome_exe.gypi1
5 files changed, 11 insertions, 1 deletions
diff --git a/chrome/app/app.saves b/chrome/app/app.saves
new file mode 100644
index 0000000..252f544
--- /dev/null
+++ b/chrome/app/app.saves
@@ -0,0 +1,8 @@
+# Copyright (c) 2010 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.
+
+# This file lists symbols that should not be stripped from the Mac browser and
+# helper app executables.
+
+_main
diff --git a/chrome/app/chrome_exe_main.mm b/chrome/app/chrome_exe_main.mm
index 5594282..4f2e474 100644
--- a/chrome/app/chrome_exe_main.mm
+++ b/chrome/app/chrome_exe_main.mm
@@ -11,6 +11,7 @@ extern "C" {
int ChromeMain(int argc, char** argv);
}
+__attribute__((visibility("default")))
int main(int argc, char* argv[]) {
int rv = ChromeMain(argc, argv);
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index eb07bb5..f3c496a 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1046,6 +1046,7 @@
'xcode_settings': {
'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
'CHROMIUM_SHORT_NAME': '<(branding)',
+ 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
'INFOPLIST_FILE': 'app/helper-Info.plist',
},
'copies': [
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 3ac0a7c..d6dd68a 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -171,7 +171,6 @@
'sources': [
'app/chrome_dll_main.cc',
'app/chrome_dll_resource.h',
- 'app/chrome_exe_main.mm',
],
'include_dirs': [
'<(grit_out_dir)',
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 995032a..570357d4 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -35,6 +35,7 @@
'app/app-Info.plist',
],
'xcode_settings': {
+ 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
'INFOPLIST_FILE': 'app/app-Info.plist',
},
'conditions': [