diff options
Diffstat (limited to 'www/chromium/files/patch-BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-BUILD.gn | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index d283d4564188..88cb1c24f737 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-09-24 04:25:55 UTC +--- BUILD.gn.orig 2021-12-31 00:57:15 UTC +++ BUILD.gn -@@ -449,7 +449,7 @@ group("gn_all") { +@@ -454,7 +454,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -494,8 +494,6 @@ group("gn_all") { +@@ -500,8 +500,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -506,7 +504,7 @@ group("gn_all") { +@@ -512,7 +510,7 @@ group("gn_all") { ] } @@ -27,7 +27,7 @@ # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } -@@ -550,10 +548,6 @@ group("gn_all") { +@@ -556,10 +554,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -38,7 +38,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -612,10 +606,6 @@ group("gn_all") { +@@ -618,10 +612,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -49,7 +49,7 @@ ] if (!is_android) { -@@ -693,7 +683,7 @@ group("gn_all") { +@@ -699,7 +689,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -58,7 +58,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -708,7 +698,7 @@ group("gn_all") { +@@ -715,7 +705,7 @@ group("gn_all") { } } @@ -67,15 +67,34 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -825,7 +815,6 @@ group("gn_all") { - "//chrome/browser/vr:vr_common_perftests", +@@ -829,15 +819,17 @@ group("gn_all") { "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", -- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", ] - if (is_android) { - deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1131,7 +1120,7 @@ if (!is_ios) { +- if (!is_android) { +- deps += [ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests" ] +- } else { +- deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] +- import("//tools/perf/chrome_telemetry_build/android_browser_types.gni") +- foreach(_target_suffix, telemetry_android_browser_target_suffixes) { +- deps += [ +- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}", +- ] ++ if (!is_bsd) { ++ if (!is_android) { ++ deps += [ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests" ] ++ } else { ++ deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] ++ import("//tools/perf/chrome_telemetry_build/android_browser_types.gni") ++ foreach(_target_suffix, telemetry_android_browser_target_suffixes) { ++ deps += [ ++ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}", ++ ] ++ } + } + } + } +@@ -1140,7 +1132,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -84,7 +103,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1140,7 +1129,7 @@ if (!is_ios) { +@@ -1149,7 +1141,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -93,7 +112,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1374,7 +1363,7 @@ group("chromium_builder_perf") { +@@ -1518,7 +1510,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } if (is_linux || is_chromeos_lacros) { @@ -102,7 +121,7 @@ # In GN builds, this is controlled by the 'linux_dump_symbols' # flag, which defaults to 1 for official builds. For now, # we skip the separate flag and just key off of is_official_build. -@@ -1386,9 +1375,6 @@ group("chromium_builder_perf") { +@@ -1530,9 +1522,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] |