diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 07:25:06 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 07:25:06 +0000 |
| commit | d0ea9a67eec3137940326bac3de97d4dfa459a08 (patch) | |
| tree | ed0aa06fe980c5f9261f178964c8223bc003b403 /build | |
| parent | b0d3f08961d7bb2e17df4683b7dfbce9a6ece4ee (diff) | |
| download | chromium_src-d0ea9a67eec3137940326bac3de97d4dfa459a08.zip chromium_src-d0ea9a67eec3137940326bac3de97d4dfa459a08.tar.gz chromium_src-d0ea9a67eec3137940326bac3de97d4dfa459a08.tar.bz2 | |
Allow Chromium Linux to be built with Breakpad. Enable Linux CHROME_HEADLESS support.
TEST=none
BUG=19663
Review URL: http://codereview.chromium.org/173095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index 5b7790d..694dd32 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -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'], + }], ], }, }], |