summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome__chrome_browser.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome__chrome_browser.gypi')
-rw-r--r--www/chromium/files/patch-chrome__chrome_browser.gypi42
1 files changed, 21 insertions, 21 deletions
diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi
index dd476ab4bd55..4d2db23b0960 100644
--- a/www/chromium/files/patch-chrome__chrome_browser.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser.gypi
@@ -1,6 +1,20 @@
---- chrome/chrome_browser.gypi.orig 2014-10-10 09:15:30 UTC
-+++ chrome/chrome_browser.gypi
-@@ -3123,7 +3123,7 @@
+--- chrome/chrome_browser.gypi.orig 2015-07-21 22:00:15.902799000 -0400
++++ chrome/chrome_browser.gypi 2015-07-21 22:08:53.180707000 -0400
+@@ -3277,6 +3277,13 @@
+ 'browser/download/download_dir_policy_handler.h',
+ ],
+ }],
++ ['os_bsd==1', {
++ 'sources/': [
++ ['exclude', '^browser/chrome_browser_main_linux.cc'],
++ ['exclude', '^browser/chrome_browser_main_linux.h'],
++ ['exclude', '^browser/media_galleries/linux/'],
++ ],
++ }],
+ ['OS=="mac"', {
+ 'dependencies': [
+ 'app_shim',
+@@ -3416,7 +3423,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
],
}],
@@ -9,30 +23,16 @@
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
-@@ -3180,7 +3180,7 @@
- }],
- ],
+@@ -3472,7 +3479,7 @@
+ ['use_x11==1', {
+ 'sources': [ '<@(chrome_browser_x11_sources)' ],
}],
- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
'sources': [
'app/chrome_crash_reporter_client.cc',
'app/chrome_crash_reporter_client.h',
-@@ -3267,6 +3267,13 @@
- }, { # Non-Android.
- 'sources': [ '<@(chrome_browser_non_android_sources)' ],
- }],
-+ ['os_bsd==1', {
-+ 'sources/': [
-+ ['exclude', '^browser/chrome_browser_main_linux.cc'],
-+ ['exclude', '^browser/chrome_browser_main_linux.h'],
-+ ['exclude', '^browser/media_galleries/linux/'],
-+ ],
-+ }],
- ['OS=="mac"', {
- 'dependencies': [
- '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
-@@ -3343,7 +3350,7 @@
+@@ -3667,7 +3674,7 @@
}],
],
}],