diff options
Diffstat (limited to 'www/chromium/files/patch-content_test_BUILD.gn')
-rw-r--r-- | www/chromium/files/patch-content_test_BUILD.gn | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn deleted file mode 100644 index e9290842b1f4..000000000000 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ /dev/null @@ -1,52 +0,0 @@ ---- content/test/BUILD.gn.orig 2017-06-15 21:03:05.000000000 +0200 -+++ content/test/BUILD.gn 2017-06-22 13:52:52.066701000 +0200 -@@ -815,7 +815,7 @@ - } - } - -- if (is_android || is_linux || is_mac || is_win) { -+ if (is_android || is_linux || is_bsd || is_mac || is_win) { - data += [ - "$root_out_dir/content_shell.pak", - "data/", -@@ -1435,14 +1435,19 @@ - sources += [ "../common/quarantine/quarantine_unittest.cc" ] - } - -+ if (is_bsd) { -+ sources -= [ -+ "../browser/memory/test_memory_monitor.cc", -+ "../common/quarantine/quarantine_linux_unittest.cc", -+ ] -+ } -+ - # ChromeOS also defines linux but their memory-monitors conflict. - if (is_chromeos) { - sources += [ "../browser/memory/memory_monitor_chromeos_unittest.cc" ] -- } else { -- sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ] - } - -- if (is_android || is_linux || is_mac || is_win) { -+ if (is_android || is_linux || is_bsd || is_mac || is_win) { - data = [ - "$root_out_dir/content_shell.pak", - "data/", -@@ -1657,7 +1662,7 @@ - "//ui/shell_dialogs:shell_dialogs", - ] - -- if (is_linux || is_mac || is_win) { -+ if (is_linux || is_bsd || is_mac || is_win) { - sources += - [ "../browser/media/capture/desktop_capture_device_unittest.cc" ] - deps += [ "//third_party/webrtc/modules/desktop_capture" ] -@@ -1695,7 +1700,7 @@ - } - } - -- if (is_linux) { -+ if (is_linux || is_bsd) { - if (use_dbus) { - deps += [ "//dbus:test_support" ] - } |