summaryrefslogtreecommitdiffstats
path: root/www/chromium/files/patch-base_BUILD.gn
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_BUILD.gn')
-rw-r--r--www/chromium/files/patch-base_BUILD.gn27
1 files changed, 18 insertions, 9 deletions
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index eedcb50..58fb5db 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,7 +1,17 @@
---- base/BUILD.gn.orig 2017-03-09 20:04:26 UTC
+--- base/BUILD.gn.orig 2017-04-19 19:06:28 UTC
+++ base/BUILD.gn
-@@ -1116,6 +1116,35 @@ component("base") {
- public_deps += [ "//base/allocator:unified_allocator_shim" ]
+@@ -1156,6 +1156,9 @@ component("base") {
+ deps += [ "//base/allocator:tcmalloc" ]
+ } else if (is_linux && use_allocator == "none") {
+ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
++ } else if (is_bsd && use_allocator == "none") {
++ # TODO move the code to "allocator_shim_default_dispatch_to_glibc.cc"
++ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
+ } else if (is_android && use_allocator == "none") {
+ sources += [
+ "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
+@@ -1171,6 +1174,34 @@ component("base") {
+ }
}
+ if (is_bsd) {
@@ -15,11 +25,10 @@
+ "sys_info_linux.cc",
+ "trace_event/malloc_dump_provider.cc",
+ "trace_event/malloc_dump_provider.h",
-+ "debug/proc_maps_linux.cc",
-+ "debug/proc_maps_linux.h",
+ ]
+ sources += [
+ "files/file_path_watcher_stub.cc",
++ "process/memory_stubs.cc",
+ "process/process_handle_freebsd.cc",
+ "process/process_iterator_freebsd.cc",
+ "process/process_metrics_freebsd.cc",
@@ -36,7 +45,7 @@
# Allow more direct string conversions on platforms with native utf8
# strings
if (is_mac || is_ios || is_chromeos || is_chromecast) {
-@@ -1416,7 +1445,7 @@ component("base") {
+@@ -1467,7 +1498,7 @@ component("base") {
}
# Linux.
@@ -45,7 +54,7 @@
if (is_asan || is_lsan || is_msan || is_tsan) {
# For llvm-sanitizer.
data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
-@@ -1441,7 +1470,7 @@ component("base") {
+@@ -1492,7 +1523,7 @@ component("base") {
"//base/third_party/xdg_user_dirs",
]
} else {
@@ -54,7 +63,7 @@
sources -= [
"nix/mime_util_xdg.cc",
"nix/mime_util_xdg.h",
-@@ -1457,6 +1486,13 @@ component("base") {
+@@ -1508,6 +1539,13 @@ component("base") {
}
}
@@ -68,7 +77,7 @@
# iOS
if (is_ios) {
set_sources_assignment_filter([])
-@@ -2245,6 +2281,12 @@ test("base_unittests") {
+@@ -2309,6 +2347,12 @@ test("base_unittests") {
set_sources_assignment_filter(sources_assignment_filter)
}
OpenPOWER on IntegriCloud