1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- content/test/BUILD.gn.orig 2017-06-15 21:03:05.000000000 +0200
+++ content/test/BUILD.gn 2017-06-22 13:52:52.066701000 +0200
@@ -815,7 +815,7 @@
}
}
- if (is_android || is_linux || is_mac || is_win) {
+ if (is_android || is_linux || is_bsd || is_mac || is_win) {
data += [
"$root_out_dir/content_shell.pak",
"data/",
@@ -1435,14 +1435,19 @@
sources += [ "../common/quarantine/quarantine_unittest.cc" ]
}
+ if (is_bsd) {
+ sources -= [
+ "../browser/memory/test_memory_monitor.cc",
+ "../common/quarantine/quarantine_linux_unittest.cc",
+ ]
+ }
+
# ChromeOS also defines linux but their memory-monitors conflict.
if (is_chromeos) {
sources += [ "../browser/memory/memory_monitor_chromeos_unittest.cc" ]
- } else {
- sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ]
}
- if (is_android || is_linux || is_mac || is_win) {
+ if (is_android || is_linux || is_bsd || is_mac || is_win) {
data = [
"$root_out_dir/content_shell.pak",
"data/",
@@ -1657,7 +1662,7 @@
"//ui/shell_dialogs:shell_dialogs",
]
- if (is_linux || is_mac || is_win) {
+ if (is_linux || is_bsd || is_mac || is_win) {
sources +=
[ "../browser/media/capture/desktop_capture_device_unittest.cc" ]
deps += [ "//third_party/webrtc/modules/desktop_capture" ]
@@ -1695,7 +1700,7 @@
}
}
- if (is_linux) {
+ if (is_linux || is_bsd) {
if (use_dbus) {
deps += [ "//dbus:test_support" ]
}
|
