Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn
--- src/3rdparty/chromium/BUILD.gn.orig 2017-06-20 05:10:02.000000000 -0400 | --- src/3rdparty/chromium/BUILD.gn.orig 2018-11-13 18:25:11 UTC | ||||
+++ src/3rdparty/chromium/BUILD.gn 2017-12-15 16:23:27.924636000 -0500 | +++ src/3rdparty/chromium/BUILD.gn | ||||
@@ -218,7 +218,7 @@ | @@ -356,7 +356,7 @@ group("gn_all") { | ||||
] | [ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ] | ||||
} | } | ||||
- if (!is_ios && !is_android && !is_chromecast) { | - if (is_linux || is_android) { | ||||
+ if (!is_ios && !is_android && !is_bsd && !is_chromecast) { | + if ((is_linux && !is_bsd) || is_android) { | ||||
deps += [ | deps += [ | ||||
"//chrome", | "//third_party/breakpad:breakpad_unittests", | ||||
"//chrome/test:browser_tests", | "//third_party/breakpad:core-2-minidump", | ||||
@@ -286,7 +286,7 @@ | @@ -391,15 +391,13 @@ group("gn_all") { | ||||
} | |||||
} | |||||
- 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. | |||||
deps += [ | |||||
@@ -336,7 +336,7 @@ | |||||
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)", | |||||
] | ] | ||||
} | } | ||||
- } else { | |||||
+ } else if (!is_bsd) { | |||||
deps += [ "//ios:all" ] | |||||
} | |||||
@@ -504,18 +504,23 @@ | |||||
] | |||||
} | |||||
- if (is_linux) { | - if (is_linux) { | ||||
- # The following are definitely linux-only. | |||||
+ if (is_linux || is_bsd) { | + if (is_linux || is_bsd) { | ||||
+ # The following are definitely? linux-only. | # The following are definitely linux-only. | ||||
deps += [ | deps += [ | ||||
"//chrome:manpage", | |||||
"//chrome:xdg_mime", | "//chrome:xdg_mime", | ||||
"//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", | |||||
] | ] | ||||
+ if (is_linux) { | @@ -416,7 +414,7 @@ group("gn_all") { | ||||
+ deps += [ | |||||
+ "//sandbox/linux:chrome_sandbox", | |||||
+ "//sandbox/linux:sandbox_linux_unittests", | |||||
+ ] | |||||
+ } | |||||
+ | |||||
if (use_dbus) { | |||||
deps += [ | |||||
"//dbus:dbus_test_server", | |||||
@@ -533,7 +538,7 @@ | |||||
} | } | ||||
} | } | ||||
- if (is_ios || is_win || (is_linux && !is_chromeos)) { | - if (is_ios || is_win || (is_linux && !is_chromeos)) { | ||||
+ if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { | + if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { | ||||
deps += [ | deps += [ | ||||
"//base:base_i18n_perftests", | "//base:base_i18n_perftests", | ||||
"//base:base_perftests", | "//google_apis:google_apis_unittests", | ||||
@@ -612,7 +617,7 @@ | @@ -456,10 +454,6 @@ group("gn_all") { | ||||
"//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", | |||||
@@ -489,7 +483,7 @@ group("gn_all") { | |||||
if (enable_nacl) { | if (enable_nacl) { | ||||
deps += [ "//components/nacl/loader:nacl_loader_unittests" ] | deps += [ "//components/nacl/loader:nacl_loader_unittests" ] | ||||
- if (is_linux) { | - if (is_linux) { | ||||
+ if (is_linux || is_bsd) { | + if (is_linux || is_bsd) { | ||||
# TODO(dpranke): Figure out what platforms should actually have this. | # TODO(dpranke): Figure out what platforms should actually have this. | ||||
deps += [ "//components/nacl/loader:nacl_helper" ] | deps += [ "//components/nacl/loader:nacl_helper" ] | ||||
@@ -722,7 +727,7 @@ | @@ -515,10 +509,6 @@ group("gn_all") { | ||||
deps += | "//mojo:mojo_perftests", | ||||
[ "//chrome/installer/mini_installer:next_version_mini_installer" ] | "//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_android) { | |||||
@@ -595,7 +585,7 @@ group("gn_all") { | |||||
host_os == "win" && !use_qt) { | |||||
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] | |||||
} | } | ||||
- } else if (!is_android && !is_ios) { | - } else if (!is_android && !is_ios && !is_fuchsia) { | ||||
+ } else if (!is_android && !is_ios && !is_bsd) { | + } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { | ||||
deps += [ "//breakpad:symupload($host_toolchain)" ] | deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] | ||||
} | } | ||||
@@ -787,7 +792,7 @@ | @@ -648,7 +638,7 @@ group("gn_all") { | ||||
deps += [ "//third_party/perfetto:all" ] | |||||
} | } | ||||
} | |||||
- if (is_linux && !is_chromeos && !is_chromecast) { | - if (is_linux && !is_chromeos && !is_chromecast) { | ||||
+ if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) { | + if (is_bsd || (is_linux && !is_chromeos && !is_chromecast)) { | ||||
# TODO(GYP): Figure out if any of these should be in gn_all | # TODO(GYP): Figure out if any of these should be in gn_all | ||||
# and figure out how cross-platform they are | # and figure out how cross-platform they are | ||||
deps += [ | deps += [ | ||||
@@ -840,7 +845,7 @@ | @@ -685,7 +675,7 @@ group("gn_all") { | ||||
] | } | ||||
if (target_cpu == "x86" || target_cpu == "x64") { | if (target_cpu == "x86" || target_cpu == "x64") { | ||||
- if (!is_android) { | - if (!is_android) { | ||||
+ if (!is_android && !is_bsd) { | + if (!is_android && !is_bsd) { | ||||
deps += [ "//chrome/test:load_library_perf_tests" ] | deps += [ "//chrome/test:load_library_perf_tests" ] | ||||
if (use_qt) { | |||||
deps -= [ "//chrome/test:load_library_perf_tests" ] | |||||
@@ -851,7 +856,7 @@ | |||||
"//third_party/libjpeg_turbo:simd_asm", | |||||
] | |||||
} | } | ||||
if (enable_nacl) { | |||||
@@ -693,13 +683,13 @@ group("gn_all") { | |||||
} | |||||
deps += [ "//third_party/libjpeg_turbo:simd_asm" ] | |||||
} | |||||
- if (is_linux && current_toolchain == host_toolchain) { | - if (is_linux && current_toolchain == host_toolchain) { | ||||
+ if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { | + if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { | ||||
deps += [ "//v8:v8_shell" ] | deps += [ "//v8:v8_shell" ] | ||||
} | } | ||||
} | } | ||||
@@ -861,7 +866,7 @@ | |||||
} | |||||
if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || | if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || | ||||
- (use_libfuzzer && is_mac)) { | - (use_libfuzzer && is_mac)) { | ||||
+ (use_libfuzzer && is_mac) || is_bsd) { | + (use_libfuzzer && is_mac) || is_bsd) { | ||||
deps += [ | deps += [ | ||||
"//testing/libfuzzer/fuzzers", | "//testing/libfuzzer/fuzzers", | ||||
"//testing/libfuzzer/tests:libfuzzer_tests", | "//testing/libfuzzer/tests:libfuzzer_tests", | ||||
@@ -904,7 +909,7 @@ | @@ -821,7 +811,6 @@ if (is_chromeos) { | ||||
"//ppapi/examples/video_decode", | |||||
"//sandbox/linux:chrome_sandbox", | |||||
"//sandbox/linux:sandbox_linux_unittests", | |||||
- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", | |||||
group("gn_mojo_targets") { | # Blocked on https://github.com/catapult-project/catapult/issues/2297 | ||||
testonly = true | #"//third_party/catapult/telemetry:bitmaptools", | ||||
- if (is_linux && !is_chromeos) { | @@ -870,7 +859,7 @@ group("gn_visibility") { | ||||
+ if (is_bsd || (is_linux && !is_chromeos)) { | |||||
# TODO(GYP): Figure out if any of these should be in gn_all | |||||
# and figure out how cross-platform they are | |||||
deps = [ | |||||
@@ -930,7 +935,7 @@ | |||||
} | } | ||||
} | } | ||||
-if (!is_ios) { | -if (!is_ios && !use_qt) { | ||||
+if (!is_ios || !is_bsd) { | +if (!is_ios && !use_qt && !is_bsd) { | ||||
# This group includes all of the targets needed to build and test Blink, | # This group includes all of the targets needed to build and test Blink, | ||||
# including running the layout tests (see below). | # including running the layout tests (see below). | ||||
group("blink_tests") { | group("blink_tests") { | ||||
@@ -976,7 +981,7 @@ | @@ -944,7 +933,7 @@ if (!is_ios && !use_qt) { | ||||
data_deps += [ "//content/shell:content_shell_crash_service" ] | ] | ||||
} | } | ||||
- 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 += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] | data_deps += | ||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] | |||||
} | } | ||||
@@ -953,7 +942,7 @@ if (!is_ios && !use_qt) { | |||||
@@ -984,7 +989,7 @@ | data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | ||||
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] | |||||
} | } | ||||
- if (is_linux) { | - if (is_linux) { | ||||
+ if (is_linux && !is_bsd) { | + if (is_linux && !is_bsd) { | ||||
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] | data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] | ||||
} | } | ||||
@@ -1006,7 +1011,7 @@ | @@ -1045,7 +1034,7 @@ if (!is_ios && !use_qt) { | ||||
group("chromium_builder_perf") { | group("chromium_builder_perf") { | ||||
testonly = true | testonly = true | ||||
- if (!is_ios && !is_android && !is_chromecast) { | - if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { | ||||
+ if (!is_ios && !is_android && !is_chromecast && !is_bsd) { | + if (!is_ios && !is_android && !is_chromecast && !is_fuchsia && !is_bsd) { | ||||
data_deps = [ | data_deps = [ | ||||
"//cc:cc_perftests", | "//cc:cc_perftests", | ||||
"//chrome/test:load_library_perf_tests", | "//chrome/test:load_library_perf_tests", | ||||
@@ -1043,7 +1048,7 @@ | @@ -1078,9 +1067,6 @@ 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 { | ||||
+ } else if (!is_bsd) { | - data_deps += | ||||
data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] | - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] | ||||
} | } | ||||
} | if (is_win || is_android) { | ||||
data_deps += [ |