| Index: chrome/chrome.gyp
|
| diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
|
| index 092fcb30ab607d4f6b1a00912f02819749dfacb3..93e4cbec29df947c8831ea1ef90a21f8326ddc8d 100644
|
| --- a/chrome/chrome.gyp
|
| +++ b/chrome/chrome.gyp
|
| @@ -1524,13 +1524,24 @@
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| 'sources!': [
|
| - # TODO(port): add this to the Linux build once a
|
| - # window_sizer_linux.cc is written
|
| + # TODO(port): add this to the Linux build once a
|
| + # window_sizer_linux.cc is written
|
| 'browser/window_sizer.cc',
|
| 'browser/debugger/debugger_shell_stubs.cc',
|
| # Windows-specific files.
|
| 'browser/download/download_exe.cc',
|
| ],
|
| + 'conditions': [
|
| + ['linux_breakpad==1', {
|
| + 'sources': [
|
| + 'browser/renderer_host/render_crash_handler_host_linux.cc',
|
| + ],
|
| + }, {
|
| + 'sources': [
|
| + 'browser/renderer_host/render_crash_handler_host_linux_stub.cc',
|
| + ],
|
| + }],
|
| + ],
|
| }],
|
| ['OS=="linux" and toolkit_views==0', {
|
| 'sources!': [
|
| @@ -1856,6 +1867,18 @@
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| + 'conditions': [
|
| + ['linux_breakpad==1', {
|
| + 'sources': [
|
| + 'renderer/render_crash_handler_linux.cc',
|
| + 'renderer/render_crash_handler_linux.h',
|
| + ],
|
| + }, {
|
| + 'sources': [
|
| + 'renderer/render_crash_handler_linux_stub.cc',
|
| + ],
|
| + }]
|
| + ],
|
| }],
|
| # Windows-specific rules.
|
| ['OS=="win"', {
|
| @@ -1997,11 +2020,32 @@
|
| 'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'],
|
| },
|
| ],
|
| + 'include_dirs': [
|
| + # Needed in order to be able to read the raw
|
| + # file_version_info_linux.h file.
|
| + '<(SHARED_INTERMEDIATE_DIR)',
|
| + ],
|
| + 'conditions': [
|
| + ['linux_breakpad==1', {
|
| + 'sources': [
|
| + 'app/breakpad_linux.cc',
|
| + 'app/breakpad_linux.h',
|
| + ],
|
| + 'dependencies': [
|
| + '../breakpad/breakpad.gyp:breakpad_client',
|
| + ],
|
| + }, {
|
| + 'sources': [
|
| + 'app/breakpad_linux_stub.cc',
|
| + 'app/breakpad_linux.h',
|
| + ],
|
| + }],
|
| + ]
|
| }],
|
| ['OS=="linux" and toolkit_views==1', {
|
| 'dependencies': [
|
| '../views/views.gyp:views',
|
| - ],
|
| + ],
|
| }],
|
| ['OS=="mac"', {
|
| # 'branding' is a variable defined in common.gypi
|
| @@ -3115,6 +3159,9 @@
|
| }
|
| }],
|
| ['OS=="linux"', {
|
| + 'variables': {
|
| + 'linux_breakpad%': 1,
|
| + },
|
| 'targets': [
|
| {
|
| 'target_name': 'convert_dict',
|
|
|