diff options
author | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
commit | 9187a6460fc419eec4dc64a4569e306722a83427 (patch) | |
tree | b3d680efe613bd39a30a50f60bcb0ce36a78eab2 /www/chromium/files/patch-chrome_test_BUILD.gn | |
parent | Some aarch64 servers apparently have ACPI. Attempt to build on aarch64 (diff) |
www/chromium: update to 54.0.2840.100
Submitted by: clutton <clutton@zoho.com>
Reviewed by: cpm, rene
Obtained from: https://github.com/paranormal/
MFH: 2016Q4
Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html
Differential Revision: https://reviews.freebsd.org/D8517
Notes
Notes:
svn path=/head/; revision=426855
Diffstat (limited to 'www/chromium/files/patch-chrome_test_BUILD.gn')
-rw-r--r-- | www/chromium/files/patch-chrome_test_BUILD.gn | 176 |
1 files changed, 176 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn new file mode 100644 index 000000000000..bbcf57000c0f --- /dev/null +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -0,0 +1,176 @@ +--- chrome/test/BUILD.gn.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/test/BUILD.gn 2016-10-13 06:28:37.584668000 +0300 +@@ -179,7 +179,7 @@ + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + public_deps += [ "//crypto:platform" ] + } + if (is_mac) { +@@ -383,7 +383,7 @@ + "$root_out_dir/test_page.css.mock-http-headers", + "$root_out_dir/ui_test.pak", + ] +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/chrome_200_percent.pak", +@@ -391,7 +391,7 @@ + "$root_out_dir/locales/fr.pak", + ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + data += [ "$root_out_dir/libppapi_tests.so" ] + } + +@@ -462,7 +462,7 @@ + ".", + "//chrome") + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (!is_chromeos) { + # Desktop linux. + sources -= [ +@@ -1097,14 +1097,14 @@ + sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ] + deps += [ "//chrome/browser/chromeos" ] + data_deps += [ "//third_party/liblouis:liblouis_test_data" ] +- } else if (is_linux || is_win) { ++ } else if (is_linux || is_bsd || is_win) { + sources += [ + "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", + "../browser/ui/views/ime/ime_window_browsertest.cc", + ] + } + +- if (is_win || is_linux) { ++ if (is_win || is_linux || is_bsd) { + sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] + data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] + } +@@ -1116,7 +1116,7 @@ + configs += + [ "//build/config/win:default_large_module_incremental_linking" ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + data_deps += [ "//components/nacl/loader:nacl_helper" ] + + if (enable_nacl_nonsfi) { +@@ -1176,7 +1176,7 @@ + } + } + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + # Set rpath to find the CDM adapter even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } +@@ -1226,7 +1226,7 @@ + if (toolkit_views) { + sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] + } +- if (is_win || is_linux) { ++ if (is_win || is_linux || is_bsd) { + sources += + [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] + } +@@ -1385,7 +1385,7 @@ + ] + deps += [ "//components/wifi:test_support" ] + } +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + sources += rebase_path( + chrome_tests_gypi_values.chrome_browser_tests_non_mac_desktop_sources, + ".", +@@ -1400,7 +1400,7 @@ + "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", + ] + } +- if (is_mac || is_win || (is_linux && !is_chromeos)) { ++ if (is_mac || is_win || is_bsd || (is_linux && !is_chromeos)) { + sources += rebase_path( + chrome_tests_gypi_values.chrome_browser_tests_non_mobile_non_cros_sources, + ".", +@@ -1519,7 +1519,7 @@ + "$root_out_dir/pyproto/", + ] + +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/chrome_200_percent.pak", +@@ -1768,7 +1768,7 @@ + "$root_out_dir/locales/en-US.pak", + ] + } +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ "$root_out_dir/chrome_200_percent.pak" ] + } + +@@ -1974,7 +1974,7 @@ + "//ui/wm", + ] + } +- if (!is_chromeos && is_linux) { ++ if (!is_chromeos && (is_linux || is_bsd)) { + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_sources, + ".", +@@ -1991,7 +1991,7 @@ + if (use_gio) { + deps += [ "//build/linux/libgio" ] + } +- if (!is_chromeos && !use_ozone && is_linux) { ++ if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) { + deps += [ "//chrome/browser/ui/libgtk2ui" ] + } + +@@ -2119,18 +2119,18 @@ + "//components/os_crypt:gnome_keyring_direct", + ] + } +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + sources += + [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ] + deps += [ "//third_party/libsecret" ] + } +- if (is_linux && use_aura) { ++ if ((is_linux || is_bsd) && use_aura) { + deps += [ "//ui/aura:test_support" ] + if (use_dbus) { + deps += [ "//dbus:test_support" ] + } + } +- if (is_linux && is_chrome_branded && current_cpu == "x86") { ++ if ((is_linux || is_bsd) && is_chrome_branded && current_cpu == "x86") { + ldflags = [ "-Wl,--strip-debug" ] + } + if (is_mac) { +@@ -2365,7 +2365,7 @@ + } + } + +-if (!is_android) { ++if (!is_android && !is_bsd) { + # TODO(609855): Make this compile on Android and run on the bots. + test("chrome_app_unittests") { + sources = [ +@@ -2391,7 +2391,7 @@ + } + } + +-if (!is_android && !is_ios && !is_chromecast) { ++if (!is_android && !is_ios && !is_chromecast && !is_bsd) { + test("performance_browser_tests") { + sources = + rebase_path(chrome_tests_gypi_values.performance_browser_tests_sources, |