diff options
Diffstat (limited to 'www/chromium/files/patch-ui_base_BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-ui_base_BUILD.gn | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/www/chromium/files/patch-ui_base_BUILD.gn b/www/chromium/files/patch-ui_base_BUILD.gn index 9f379493fb2d..8af223c9b9d5 100644 --- a/www/chromium/files/patch-ui_base_BUILD.gn +++ b/www/chromium/files/patch-ui_base_BUILD.gn @@ -1,7 +1,7 @@ ---- ui/base/BUILD.gn.orig 2017-08-10 15:44:20.348174000 +0200 -+++ ui/base/BUILD.gn 2017-08-10 15:50:46.788601000 +0200 -@@ -365,7 +365,7 @@ - sources -= [ "touch/touch_device_util.cc" ] +--- ui/base/BUILD.gn.orig 2017-09-05 21:05:48.000000000 +0200 ++++ ui/base/BUILD.gn 2017-09-08 14:20:33.060901000 +0200 +@@ -369,7 +369,7 @@ + sources += [ "touch/touch_device_android.cc" ] } else if (is_ios) { sources += [ "touch/touch_device_ios.cc" ] - } else if (is_linux) { @@ -9,21 +9,27 @@ sources += [ "touch/touch_device_linux.cc" ] } else { # Empty implementation for all other cases. -@@ -476,11 +476,11 @@ - ] +@@ -377,6 +377,10 @@ + sources -= [ "touch/touch_device_util.cc" ] } -- if (!use_aura || !is_linux) { -+ if (!use_aura || !(is_linux || is_bsd)) { ++ if (is_bsd) { ++ sources += [ "resource/resource_bundle_freebsd.cc" ] ++ } ++ + if (is_fuchsia) { + sources += [ + "clipboard/clipboard_fuchsia.cc", +@@ -492,7 +496,7 @@ sources -= [ "resource/resource_bundle_auralinux.cc" ] } - if (is_linux) { + if (is_linux || is_bsd) { - deps += [ "//build/linux:fontconfig" ] + deps += [ "//third_party/fontconfig" ] } -@@ -498,7 +498,7 @@ +@@ -510,7 +514,7 @@ sources -= [ "idle/idle_linux.cc" ] } @@ -32,7 +38,7 @@ sources += [ "dragdrop/os_exchange_data_provider_aura.cc", "dragdrop/os_exchange_data_provider_aura.h", -@@ -841,7 +841,7 @@ +@@ -862,7 +866,7 @@ "ime/win/imm32_manager_unittest.cc", "ime/win/tsf_input_scope_unittest.cc", ] @@ -41,21 +47,21 @@ sources += [ "ime/input_method_auralinux_unittest.cc" ] } if (use_x11) { -@@ -964,7 +964,7 @@ +@@ -985,7 +989,7 @@ ] } -- if (is_android || is_linux || is_mac || is_win) { -+ if (is_android || is_linux || is_bsd || is_mac || is_win) { +- if (is_android || is_linux || is_mac || is_win || is_fuchsia) { ++ if (is_android || is_linux || is_bsd || is_mac || is_win || is_fuchsia) { # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak # instead of depending directly on the non-test .pak files, but depending # on ui_test_pak seems to have no effect. -@@ -977,7 +977,7 @@ +@@ -998,7 +1002,7 @@ "//third_party/mesa:osmesa", ] } -- if (is_linux || is_win) { -+ if (is_linux || is_bsd || is_win) { +- if (is_linux || is_win || is_fuchsia) { ++ if (is_linux || is_bsd || is_win || is_fuchsia) { data += [ # TODO(brettw): Remove these two lines. "$root_out_dir/ui/en-US.pak", |