Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(751)

Unified Diff: build/common.gypi

Issue 173095: Allow Chromium Linux to be built with Breakpad. Enable Linux CHROME_HEADLESS ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: move linux_breakpad==1 check into condition OS==Linux block Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « breakpad/breakpad.gyp ('k') | chrome/app/breakpad_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 23911)
+++ build/common.gypi (working copy)
@@ -31,6 +31,10 @@
# on 'buildtype' (i.e. we don't care about saving symbols for non-Official
# builds).
'buildtype%': 'Dev',
+
+ # We do want to build Chromium with Breakpad support in certain
+ # situations. I.e. for Chrome bot.
+ 'linux_chromium_breakpad%': 0,
},
# Define branding and buildtype on the basis of their settings within the
@@ -72,9 +76,9 @@
# Once all vsprops settings are migrated into gyp, this can go away.
'msvs_use_common_release%': 1,
- # TODO(bradnelson): eliminate this when possible.
- # To allow local gyp files to override additional linker options for msvs.
- # Yes(1) means set use the common linker options.
+ # TODO(bradnelson): eliminate this when possible.
+ # To allow local gyp files to override additional linker options for msvs.
+ # Yes(1) means set use the common linker options.
'msvs_use_common_linker_extras%': 1,
# TODO(sgk): eliminate this if possible.
@@ -114,6 +118,15 @@
'linux_sandbox_chrome_path%': '/opt/google/chrome/chrome',
'conditions': [
+ ['OS=="linux"', {
+ 'conditions': [
+ ['branding=="Chrome" or linux_chromium_breakpad==1', {
+ 'linux_breakpad%': 1,
+ }, {
+ 'linux_breakpad%': 0,
+ }],
+ ],
+ }], # OS=="linux"
['OS=="mac"', {
'conditions': [
# mac_product_name is set to the name of the .app bundle as it should
@@ -166,11 +179,6 @@
'conditions': [
['branding=="Chrome"', {
'defines': ['GOOGLE_CHROME_BUILD'],
- 'conditions': [
- ['OS=="linux"', {
- 'cflags': [ '-gstabs' ],
- }],
- ],
}, { # else: branding!="Chrome"
'defines': ['CHROMIUM_BUILD'],
}],
@@ -539,6 +547,10 @@
'-fno-strict-aliasing',
],
}],
+ ['linux_breakpad==1', {
+ 'cflags': [ '-gstabs' ],
+ 'defines': ['USE_LINUX_BREAKPAD'],
+ }],
],
},
}],
« no previous file with comments | « breakpad/breakpad.gyp ('k') | chrome/app/breakpad_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698