Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-BUILD.gn
| --- BUILD.gn.orig 2019-12-16 21:51:21 UTC | --- BUILD.gn.orig 2020-03-03 18:53:46 UTC | ||||
| +++ BUILD.gn | +++ BUILD.gn | ||||
| @@ -411,7 +411,7 @@ group("gn_all") { | @@ -411,7 +411,7 @@ group("gn_all") { | ||||
| ] | ] | ||||
| } | } | ||||
| - if (is_linux || is_android) { | - if (is_linux || is_android) { | ||||
| + if ((is_linux && !is_bsd) || is_android) { | + if ((is_linux && !is_bsd) || is_android) { | ||||
| deps += [ | deps += [ | ||||
| ▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines | |||||
| @@ -782,7 +772,6 @@ group("gn_all") { | @@ -782,7 +772,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_desktop_linux && use_ozone) { | ||||
| deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] | deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] | ||||
| @@ -905,7 +894,6 @@ if (is_chromeos) { | @@ -918,7 +907,6 @@ if (is_chromeos) { | ||||
| "//ppapi/examples/video_decode", | "//ppapi/examples/video_decode", | ||||
| "//sandbox/linux:chrome_sandbox", | "//sandbox/linux:chrome_sandbox", | ||||
| "//sandbox/linux:sandbox_linux_unittests", | "//sandbox/linux:sandbox_linux_unittests", | ||||
| - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", | - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", | ||||
| # Blocked on https://github.com/catapult-project/catapult/issues/2297 | # Blocked on https://github.com/catapult-project/catapult/issues/2297 | ||||
| #"//third_party/catapult/telemetry:bitmaptools", | #"//third_party/catapult/telemetry:bitmaptools", | ||||
| @@ -1076,7 +1064,7 @@ if (!is_ios) { | @@ -1069,7 +1057,7 @@ if (!is_ios) { | ||||
| ] | ] | ||||
| } | } | ||||
| - 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)" ] | ||||
| } | } | ||||
| @@ -1085,7 +1073,7 @@ if (!is_ios) { | @@ -1078,7 +1066,7 @@ if (!is_ios) { | ||||
| data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | ||||
| } | } | ||||
| - if (is_linux) { | - if (is_linux) { | ||||
| + if (is_linux && !is_bsd) { | + if (is_linux && !is_bsd) { | ||||
| data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | ||||
| } | } | ||||
| @@ -1227,9 +1215,6 @@ group("chromium_builder_perf") { | @@ -1220,9 +1208,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 += [ | ||||