diff options
Diffstat (limited to 'www/chromium/files/patch-BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-BUILD.gn | 184 |
1 files changed, 59 insertions, 125 deletions
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 96f64dec2d9e..8e1e30e6dfa8 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,162 +1,96 @@ ---- BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 -+++ BUILD.gn 2017-07-29 00:52:25.378843000 +0200 -@@ -92,7 +92,7 @@ +--- BUILD.gn.orig 2017-12-15 02:04:03.000000000 +0100 ++++ BUILD.gn 2017-12-25 04:12:31.425198000 +0100 +@@ -99,7 +99,7 @@ ] } - if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { -+ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { ++ if (!is_ios && !is_android && !is_chromecast && !is_fuchsia && !is_bsd) { deps += [ "//chrome", - "//chrome/test:browser_tests", -@@ -151,7 +151,7 @@ - ] - } - -- if (!is_ios && !is_fuchsia) { -+ if (!is_ios && !is_bsd && !is_fuchsia) { - deps += [ - "//cc:cc_unittests", - "//chrome/test:telemetry_perf_unittests", -@@ -363,7 +363,7 @@ - ] - } - -- if (is_linux) { -+ if (is_linux || is_bsd) { - # The following are definitely linux-only. - deps += [ - "//chrome:manpage", -@@ -386,9 +386,16 @@ - # TODO(dpranke): add the linux_dump_symbols flag? - deps += [ "//chrome:linux_symbols" ] + "//chrome/installer/zucchini:zucchini", +@@ -368,7 +368,7 @@ } -+ -+ if (is_bsd) { -+ deps -= [ -+ "//sandbox/linux:chrome_sandbox", -+ "//sandbox/linux:sandbox_linux_unittests", -+ ] -+ } } -- if (is_ios || is_win || (is_linux && !is_chromeos)) { -+ if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { +- if (is_linux || is_android) { ++ if ((is_linux && !is_bsd) || is_android) { deps += [ - "//base:base_i18n_perftests", - "//base:base_perftests", -@@ -459,7 +466,7 @@ - if (enable_nacl) { - deps += [ "//components/nacl/loader:nacl_loader_unittests" ] + "//third_party/breakpad:breakpad_unittests", + "//third_party/breakpad:core-2-minidump", +@@ -408,8 +408,6 @@ + "//net:disk_cache_memory_test", + "//net:quic_client", + "//net:quic_server", +- "//sandbox/linux:chrome_sandbox", +- "//sandbox/linux:sandbox_linux_unittests", + ] -- if (is_linux) { -+ if (is_linux || is_bsd) { - # TODO(dpranke): Figure out what platforms should actually have this. - deps += [ "//components/nacl/loader:nacl_helper" ] + if (use_dbus) { +@@ -465,10 +463,6 @@ + "//chrome/test/chromedriver:chromedriver", + "//chrome/test/chromedriver:chromedriver_tests", + "//components/sync:run_sync_testserver", +- "//courgette:courgette", +- "//courgette:courgette_fuzz", +- "//courgette:courgette_minimal_tool", +- "//courgette:courgette_unittests", + "//media/cast:generate_barcode_video", + "//media/cast:generate_timecode_audio", + "//net:crash_cache", +@@ -523,10 +517,6 @@ + "//mojo/edk/test:mojo_public_system_perftests", + "//services/service_manager/public/cpp", + "//testing/gmock:gmock_main", +- "//third_party/breakpad:dump_syms($host_toolchain)", +- "//third_party/breakpad:microdump_stackwalk($host_toolchain)", +- "//third_party/breakpad:minidump_dump($host_toolchain)", +- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", + ] -@@ -557,7 +564,7 @@ + if (!is_android) { +@@ -594,7 +584,7 @@ deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } - } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_bsd && !is_fuchsia) { - deps += [ "//breakpad:symupload($host_toolchain)" ] - } - -@@ -588,7 +595,7 @@ - deps += [ "//components/proximity_auth:proximity_auth_unittests" ] - } - -- if (is_win || is_linux) { -+ if (is_win || is_linux || is_bsd) { - deps += [ - "//mash:all", - "//media/mojo/services:media_service_unittests", -@@ -606,7 +613,7 @@ - } - } - -- if (is_linux && !is_chromeos && !is_chromecast) { -+ if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) { - # TODO(GYP): Figure out if any of these should be in gn_all - # and figure out how cross-platform they are - deps += [ -@@ -644,7 +651,7 @@ - } - - if (target_cpu == "x86" || target_cpu == "x64") { -- if (!is_android) { -+ if (!is_android && !is_bsd) { - deps += [ "//chrome/test:load_library_perf_tests" ] - } - deps += [ -@@ -652,13 +659,13 @@ - "//third_party/libjpeg_turbo:simd_asm", - ] - } -- if (is_linux && current_toolchain == host_toolchain) { -+ if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { - deps += [ "//v8:v8_shell" ] - } ++ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { + deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } - if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || -- (use_libfuzzer && is_mac)) { -+ (use_libfuzzer && is_mac) || is_bsd) { - deps += [ - "//testing/libfuzzer/fuzzers", - "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -677,7 +684,7 @@ - deps += [ "//native_client_sdk/src:nacl_core_sdk" ] - } +@@ -831,7 +821,6 @@ + "//ppapi/examples/video_decode", + "//sandbox/linux:chrome_sandbox", + "//sandbox/linux:sandbox_linux_unittests", +- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", -- if (is_linux && use_ozone) { -+ if ((is_linux || is_bsd ) && use_ozone) { - deps += [ - "//headless", - "//headless:headless_tests", -@@ -811,7 +818,7 @@ - } - } - --if (!is_ios && !is_fuchsia) { -+if (!is_ios && !is_bsd && !is_fuchsia) { - # This group includes all of the targets needed to build and test Blink, - # including running the layout tests (see below). - group("blink_tests") { -@@ -879,7 +886,7 @@ + # Blocked on https://github.com/catapult-project/catapult/issues/2297 + #"//third_party/catapult/telemetry:bitmaptools", +@@ -939,7 +928,7 @@ data_deps += [ "//content/shell:content_shell_crash_service" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { - data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + data_deps += + [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } - -@@ -887,7 +894,7 @@ - data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] +@@ -948,7 +937,7 @@ + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } - if (is_linux) { + if (is_linux && !is_bsd) { - data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -941,7 +948,7 @@ - group("chromium_builder_perf") { - testonly = true - -- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { -+ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { - data_deps = [ - "//cc:cc_perftests", - "//chrome/test:load_library_perf_tests", -@@ -975,7 +982,7 @@ +@@ -1066,9 +1055,6 @@ "//chrome/installer/mini_installer:mini_installer", "//chrome/test:angle_perftests", ] - } else { -+ } else if (!is_bsd) { - data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] +- data_deps += +- [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } } + } |