Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn
| --- src/3rdparty/chromium/BUILD.gn.orig 2020-11-07 01:22:36 UTC | --- src/3rdparty/chromium/BUILD.gn.orig 2021-12-15 16:12:54 UTC | ||||
| +++ src/3rdparty/chromium/BUILD.gn | +++ src/3rdparty/chromium/BUILD.gn | ||||
| @@ -419,7 +419,7 @@ group("gn_all") { | @@ -423,7 +423,7 @@ group("gn_all") { | ||||
| ] | ] | ||||
| } | } | ||||
| - if (is_linux || is_android) { | - if (is_linux || is_chromeos || is_android) { | ||||
| + if ((is_linux && !is_bsd) || is_android) { | + if ((is_linux && !is_bsd) || is_chromeos || is_android) { | ||||
| deps += [ | deps += [ | ||||
| "//third_party/breakpad:breakpad_unittests", | "//third_party/breakpad:breakpad_unittests", | ||||
| "//third_party/breakpad:core-2-minidump", | "//third_party/breakpad:core-2-minidump", | ||||
| @@ -460,8 +460,6 @@ group("gn_all") { | @@ -464,8 +464,6 @@ group("gn_all") { | ||||
| "//net:disk_cache_memory_test", | "//net:disk_cache_memory_test", | ||||
| "//net:quic_client", | "//net:quic_client", | ||||
| "//net:quic_server", | "//net:quic_server", | ||||
| - "//sandbox/linux:chrome_sandbox", | - "//sandbox/linux:chrome_sandbox", | ||||
| - "//sandbox/linux:sandbox_linux_unittests", | - "//sandbox/linux:sandbox_linux_unittests", | ||||
| "//testing:empty_main", | "//testing:empty_main", | ||||
| ] | ] | ||||
| @@ -516,10 +514,6 @@ group("gn_all") { | @@ -520,10 +518,6 @@ group("gn_all") { | ||||
| "//chrome/test:load_library_perf_tests", | "//chrome/test:load_library_perf_tests", | ||||
| "//chrome/test:sync_performance_tests", | "//chrome/test:sync_performance_tests", | ||||
| "//chrome/test/chromedriver:chromedriver", | "//chrome/test/chromedriver:chromedriver", | ||||
| - "//courgette:courgette", | - "//courgette:courgette", | ||||
| - "//courgette:courgette_fuzz", | - "//courgette:courgette_fuzz", | ||||
| - "//courgette:courgette_minimal_tool", | - "//courgette:courgette_minimal_tool", | ||||
| - "//courgette:courgette_unittests", | - "//courgette:courgette_unittests", | ||||
| "//media/cast:generate_barcode_video", | "//media/cast:generate_barcode_video", | ||||
| "//media/cast:generate_timecode_audio", | "//media/cast:generate_timecode_audio", | ||||
| "//net:crash_cache", | "//net:crash_cache", | ||||
| @@ -592,10 +586,6 @@ group("gn_all") { | @@ -595,10 +589,6 @@ group("gn_all") { | ||||
| "//mojo:mojo_perftests", | "//mojo:mojo_perftests", | ||||
| "//services/service_manager/public/cpp", | "//services/service_manager/public/cpp", | ||||
| "//testing/gmock:gmock_main", | "//testing/gmock:gmock_main", | ||||
| - "//third_party/breakpad:dump_syms($host_toolchain)", | - "//third_party/breakpad:dump_syms($host_toolchain)", | ||||
| - "//third_party/breakpad:microdump_stackwalk($host_toolchain)", | - "//third_party/breakpad:microdump_stackwalk($host_toolchain)", | ||||
| - "//third_party/breakpad:minidump_dump($host_toolchain)", | - "//third_party/breakpad:minidump_dump($host_toolchain)", | ||||
| - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", | - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", | ||||
| ] | ] | ||||
| if (!is_android) { | if (!is_android) { | ||||
| @@ -669,7 +659,7 @@ group("gn_all") { | @@ -676,7 +666,7 @@ group("gn_all") { | ||||
| host_os == "win" && !use_qt) { | host_os == "win" && !use_qt) { | ||||
| deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] | deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] | ||||
| } | } | ||||
| - } else if (!is_android && !is_ios && !is_fuchsia && !is_win) { | - } else if (!is_android && !is_ios && !is_fuchsia && !is_win) { | ||||
| + } else if (!is_android && !is_ios && !is_fuchsia && !is_win && !is_bsd) { | + } else if (!is_android && !is_ios && !is_fuchsia && !is_win && !is_bsd) { | ||||
| deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] | deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] | ||||
| } | } | ||||
| @@ -802,7 +792,6 @@ group("gn_all") { | @@ -691,7 +681,7 @@ group("gn_all") { | ||||
| } | |||||
| } | |||||
| - if (is_mac || is_win || is_android || (is_linux && !is_chromeos)) { | |||||
| + if (is_mac || is_win || is_android || (is_linux && !is_chromeos && !is_bsd)) { | |||||
| deps += [ | |||||
| "//third_party/crashpad/crashpad:crashpad_tests", | |||||
| "//third_party/crashpad/crashpad/handler:crashpad_handler", | |||||
| @@ -810,7 +800,6 @@ group("gn_all") { | |||||
| "//chrome/browser/vr:vr_common_perftests", | "//chrome/browser/vr:vr_common_perftests", | ||||
| "//chrome/browser/vr:vr_common_unittests", | "//chrome/browser/vr:vr_common_unittests", | ||||
| "//chrome/browser/vr:vr_pixeltests", | "//chrome/browser/vr:vr_pixeltests", | ||||
| - "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", | - "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", | ||||
| ] | ] | ||||
| if (is_desktop_linux && use_ozone) { | if (is_android) { | ||||
| deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] | deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] | ||||
| @@ -1085,7 +1074,7 @@ if (!is_ios && !use_qt) { | @@ -1103,7 +1092,7 @@ if (!is_ios && !use_qt) { | ||||
| ] | data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] | ||||
| } | } | ||||
| - if (!is_win && !is_android) { | - if (!is_win && !is_android) { | ||||
| + if (!is_win && !is_android && !is_bsd) { | + if (!is_win && !is_android && !is_bsd) { | ||||
| data_deps += | data_deps += | ||||
| [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] | [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] | ||||
| } | } | ||||
| @@ -1094,7 +1083,7 @@ if (!is_ios && !use_qt) { | @@ -1112,7 +1101,7 @@ if (!is_ios && !use_qt) { | ||||
| data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | ||||
| } | } | ||||
| - if (is_linux) { | - if (is_linux || is_chromeos) { | ||||
| + if (is_linux && !is_bsd) { | + if ((is_linux && !is_bsd) || is_chromeos) { | ||||
| data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | ||||
| } | } | ||||
| @@ -1286,9 +1275,6 @@ group("chromium_builder_perf") { | @@ -1308,9 +1297,6 @@ group("chromium_builder_perf") { | ||||
| if (is_win) { | if (is_win) { | ||||
| data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] | data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] | ||||
| - } else { | - } else { | ||||
| - data_deps += | - data_deps += | ||||
| - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] | - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] | ||||
| } | } | ||||
| if (is_win || is_android) { | if (is_win || is_android) { | ||||
| data_deps += [ | data_deps += [ | ||||