Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-base_BUILD.gn
--- base/BUILD.gn.orig 2019-12-16 21:51:21 UTC | --- base/BUILD.gn.orig 2020-03-03 18:53:46 UTC | ||||
+++ base/BUILD.gn | +++ base/BUILD.gn | ||||
@@ -1274,7 +1274,7 @@ jumbo_component("base") { | @@ -1302,7 +1302,7 @@ jumbo_component("base") { | ||||
# Needed for <atomic> if using newer C++ library than sysroot, except if | # Needed for <atomic> if using newer C++ library than sysroot, except if | ||||
# building inside the cros_sdk environment - use host_toolchain as a | # building inside the cros_sdk environment - use host_toolchain as a | ||||
# more robust check for this. | # more robust check for this. | ||||
- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && | - if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && | ||||
+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && | + if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && | ||||
host_toolchain != "//build/toolchain/cros:host") { | host_toolchain != "//build/toolchain/cros:host") { | ||||
libs += [ "atomic" ] | libs += [ "atomic" ] | ||||
} | } | ||||
@@ -1300,7 +1300,7 @@ jumbo_component("base") { | @@ -1328,7 +1328,7 @@ jumbo_component("base") { | ||||
"allocator/allocator_shim_override_glibc_weak_symbols.h", | "allocator/allocator_shim_override_glibc_weak_symbols.h", | ||||
] | ] | ||||
deps += [ "//base/allocator:tcmalloc" ] | deps += [ "//base/allocator:tcmalloc" ] | ||||
- } else if (is_linux && use_allocator == "none") { | - } else if (is_linux && use_allocator == "none") { | ||||
+ } else if ((is_linux && !is_bsd) && use_allocator == "none") { | + } else if ((is_linux && !is_bsd) && use_allocator == "none") { | ||||
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] | sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] | ||||
} else if (is_android && use_allocator == "none") { | } else if (is_android && use_allocator == "none") { | ||||
sources += [ | sources += [ | ||||
@@ -1903,6 +1903,33 @@ jumbo_component("base") { | @@ -1919,6 +1919,33 @@ jumbo_component("base") { | ||||
} | } | ||||
} | } | ||||
+ if (is_bsd) { | + if (is_bsd) { | ||||
+ sources -= [ | + sources -= [ | ||||
+ "files/file_path_watcher_linux.cc", | + "files/file_path_watcher_linux.cc", | ||||
+ "files/file_util_linux.cc", | + "files/file_util_linux.cc", | ||||
+ "process/memory_linux.cc", | + "process/memory_linux.cc", | ||||
Show All 16 Lines | |||||
+ "execinfo", # logging.cc | + "execinfo", # logging.cc | ||||
+ "kvm", # process_metrics_freebsd | + "kvm", # process_metrics_freebsd | ||||
+ "util" # process_metrics_freebsd | + "util" # process_metrics_freebsd | ||||
+ ] | + ] | ||||
+ } | + } | ||||
+ | + | ||||
# iOS | # iOS | ||||
if (is_ios) { | if (is_ios) { | ||||
set_sources_assignment_filter([]) | sources -= [ | ||||
@@ -3071,6 +3098,12 @@ test("base_unittests") { | @@ -3069,6 +3096,12 @@ test("base_unittests") { | ||||
] | |||||
set_sources_assignment_filter(sources_assignment_filter) | manifest = "//build/config/fuchsia/tests.cmx" | ||||
} | } | ||||
+ | + | ||||
+ if (is_bsd) { | + if (is_bsd) { | ||||
+ sources -= [ | + sources -= [ | ||||
+ "debug/proc_maps_linux_unittest.cc", | + "debug/proc_maps_linux_unittest.cc", | ||||
+ ] | + ] | ||||
+ } | + } | ||||
if (is_win) { | if (!is_fuchsia && !is_ios) { | ||||
deps += [ "//base:scoped_handle_test_dll" ] | sources += [ "files/file_locking_unittest.cc" ] |