diff options
Diffstat (limited to 'www/iridium/files/patch-BUILD.gn')
| -rw-r--r-- | www/iridium/files/patch-BUILD.gn | 208 |
1 files changed, 61 insertions, 147 deletions
diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index 7ca8be9b23be..1d5eff6a4857 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,173 +1,87 @@ ---- BUILD.gn.orig 2017-04-19 19:06:27 UTC -+++ BUILD.gn -@@ -220,7 +220,7 @@ group("both_gn_and_gyp") { - ] - } - -- if (!is_ios && !is_android && !is_chromecast) { -+ if (!is_ios && !is_android && !is_bsd && !is_chromecast) { - deps += [ - "//chrome", - "//chrome/test:browser_tests", -@@ -277,7 +277,7 @@ group("both_gn_and_gyp") { - ] +--- BUILD.gn.orig 2018-06-13 00:09:58.000000000 +0200 ++++ BUILD.gn 2018-07-14 12:26:56.482016000 +0200 +@@ -359,7 +359,7 @@ + } } -- if (!is_ios) { -+ if (!is_ios && !is_bsd) { - # TODO(GYP): Figure out which of these should actually build on iOS, - # and whether there should be other targets that are iOS-only and missing. +- if (is_linux || is_android) { ++ if ((is_linux && !is_bsd) || is_android) { deps += [ -@@ -322,7 +322,7 @@ group("both_gn_and_gyp") { - "//ui/touch_selection:ui_touch_selection_unittests", - "//url/ipc:url_ipc_unittests", + "//third_party/breakpad:breakpad_unittests", + "//third_party/breakpad:core-2-minidump", +@@ -401,8 +401,6 @@ + "//net:disk_cache_memory_test", + "//net:quic_client", + "//net:quic_server", +- "//sandbox/linux:chrome_sandbox", +- "//sandbox/linux:sandbox_linux_unittests", + "//testing:empty_main", ] -- } else { -+ } else if (!is_bsd) { - deps += [ "//ios:all" ] - } -@@ -482,7 +482,7 @@ group("both_gn_and_gyp") { +@@ -460,10 +458,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", +@@ -519,10 +513,6 @@ + "//mojo:mojo_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)", ] - } - -- if (is_linux) { -+ if (is_linux || is_bsd) { - # The following are definitely linux-only. - deps += [ - "//chrome:manpage", -@@ -505,9 +505,16 @@ group("both_gn_and_gyp") { - # TODO(dpranke): add the linux_dump_symbols flag? - deps += [ "//chrome:linux_symbols" ] - } -+ -+ 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)) { - deps += [ - "//base:base_i18n_perftests", - "//base:base_perftests", -@@ -578,7 +585,7 @@ group("both_gn_and_gyp") { - if (enable_nacl) { - deps += [ "//components/nacl/loader:nacl_loader_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" ] - -@@ -684,7 +691,7 @@ group("both_gn_and_gyp") { - deps += - [ "//chrome/installer/mini_installer:next_version_mini_installer" ] + if (!is_android) { +@@ -598,7 +588,7 @@ + host_os == "win") { + deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } -- } else if (!is_android && !is_ios) { -+ } else if (!is_android && !is_ios && !is_bsd) { - deps += [ "//breakpad:symupload($host_toolchain)" ] +- } else if (!is_android && !is_ios && !is_fuchsia) { ++ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { + deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -728,7 +735,7 @@ group("gn_only") { - deps += [ "//components/proximity_auth:proximity_auth_unittests" ] - } +@@ -818,7 +808,6 @@ + "//ppapi/examples/video_decode", + "//sandbox/linux:chrome_sandbox", + "//sandbox/linux:sandbox_linux_unittests", +- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", -- if (is_win || is_linux) { -+ if (is_win || is_linux || is_bsd) { - deps += [ - "//mash:all", - "//media/mojo/services:media_service_unittests", -@@ -754,7 +761,7 @@ group("gn_only") { - } - } - -- 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 += [ -@@ -794,7 +801,7 @@ group("gn_only") { - } - - if (target_cpu == "x86" || target_cpu == "x64") { -- if (!is_android) { -+ if (!is_android && !is_bsd) { - deps += [ "//chrome/test:load_library_perf_tests" ] - } - deps += [ -@@ -802,7 +809,7 @@ group("gn_only") { - "//third_party/libjpeg_turbo:simd_asm", + # Blocked on https://github.com/catapult-project/catapult/issues/2297 + #"//third_party/catapult/telemetry:bitmaptools", +@@ -921,7 +910,7 @@ ] } -- if (is_linux && current_toolchain == host_toolchain) { -+ if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { - deps += [ "//v8:v8_shell" ] - } - } -@@ -812,7 +819,7 @@ group("gn_only") { - } - - 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", -@@ -844,7 +851,7 @@ group("gn_only") { - - group("gn_mojo_targets") { - testonly = true -- if (is_linux && !is_chromeos) { -+ if ((is_linux || is_bsd) && !is_chromeos) { - # TODO(GYP): Figure out if any of these should be in gn_all - # and figure out how cross-platform they are - deps = [ -@@ -870,7 +877,7 @@ group("gn_visibility") { - } - } - --if (!is_ios) { -+if (!is_ios || !is_bsd) { - # This group includes all of the targets needed to build and test Blink, - # including running the layout tests (see below). - group("blink_tests") { -@@ -935,7 +942,7 @@ if (!is_ios) { - 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)" ] } - -@@ -943,7 +950,7 @@ if (!is_ios) { - data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] +@@ -930,7 +919,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)" ] } -@@ -979,7 +986,7 @@ group("chromium_swarm_tests") { - group("chromium_builder_perf") { - testonly = true +@@ -1055,9 +1044,6 @@ -- if (!is_ios && !is_android && !is_chromecast) { -+ if (!is_ios && !is_android && !is_chromecast && !is_bsd) { - data_deps = [ - "//cc:cc_perftests", - "//chrome/test:load_library_perf_tests", -@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") { - "//chrome/installer/mini_installer:mini_installer", - "//chrome/test:angle_perftests", - ] + if (is_win) { + data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] - } else { -+ } else if (!is_bsd) { - data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] +- data_deps += +- [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } - } + if (is_win || is_android) { + data_deps += [ |