diff options
Diffstat (limited to 'www/chromium/files/patch-build__common.gypi')
| -rw-r--r-- | www/chromium/files/patch-build__common.gypi | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index ba2473963b2e..3aed2daaa073 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,6 +1,6 @@ ---- ./build/common.gypi.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/common.gypi 2014-08-22 15:06:24.000000000 +0200 -@@ -87,7 +87,7 @@ +--- build/common.gypi.orig 2014-10-02 17:39:45 UTC ++++ build/common.gypi +@@ -91,7 +91,7 @@ 'conditions': [ # ChromeOS and Windows use Aura and Ash. @@ -9,7 +9,7 @@ 'use_ash%': 1, 'use_aura%': 1, }], -@@ -645,7 +645,7 @@ +@@ -676,7 +676,7 @@ }], # DBus usage. @@ -18,27 +18,36 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -926,7 +926,7 @@ - # except when building Android WebView. +@@ -931,7 +931,7 @@ + }, { + 'use_openmax_dl_fft%': 0, + }], +- ['OS=="win" or OS=="linux"', { ++ ['OS=="win" or OS=="linux" or OS=="freebsd"', { + 'enable_mdns%' : 1, + }], + +@@ -954,7 +954,7 @@ + # except when building Android WebView or Chromecast. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. -- ['android_webview_build==0', { -+ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { +- ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0', { ++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd" and android_webview_telemetry_build==0 and chromecast==0', { 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1153,6 +1153,10 @@ +@@ -1193,6 +1193,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, + # XXX(rene) More options, keep them? + 'os_ver%': 0, -+ 'use_system_libjpeg%': 0, ++ 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4150,6 +4154,13 @@ +@@ -4280,6 +4284,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], |