8 1 file changed, 4 insertions(+), 1 deletion(-) |
8 1 file changed, 4 insertions(+), 1 deletion(-) |
9 |
9 |
10 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build |
10 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build |
11 --- a/security/sandbox/linux/moz.build |
11 --- a/security/sandbox/linux/moz.build |
12 +++ b/security/sandbox/linux/moz.build |
12 +++ b/security/sandbox/linux/moz.build |
13 @@ -66,32 +66,32 @@ UNIFIED_SOURCES += [ |
13 @@ -64,17 +64,16 @@ UNIFIED_SOURCES += [ |
|
14 "../chromium/base/time/time.cc", |
|
15 "../chromium/base/time/time_exploded_posix.cc", |
14 "../chromium/base/time/time_now_posix.cc", |
16 "../chromium/base/time/time_now_posix.cc", |
15 "../chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc", |
17 "../chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc", |
16 "../chromium/sandbox/linux/bpf_dsl/codegen.cc", |
18 "../chromium/sandbox/linux/bpf_dsl/codegen.cc", |
17 "../chromium/sandbox/linux/bpf_dsl/dump_bpf.cc", |
19 "../chromium/sandbox/linux/bpf_dsl/dump_bpf.cc", |
18 "../chromium/sandbox/linux/bpf_dsl/policy.cc", |
20 "../chromium/sandbox/linux/bpf_dsl/policy.cc", |
19 "../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc", |
21 "../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc", |
20 "../chromium/sandbox/linux/bpf_dsl/syscall_set.cc", |
22 - "../chromium/sandbox/linux/bpf_dsl/syscall_set.cc", |
21 "../chromium/sandbox/linux/seccomp-bpf/die.cc", |
23 "../chromium/sandbox/linux/seccomp-bpf/die.cc", |
22 - "../chromium/sandbox/linux/seccomp-bpf/syscall.cc", |
24 "../chromium/sandbox/linux/seccomp-bpf/syscall.cc", |
|
25 "/ipc/glue/UtilityProcessSandboxing.cpp", |
23 "broker/SandboxBrokerCommon.cpp", |
26 "broker/SandboxBrokerCommon.cpp", |
24 "Sandbox.cpp", |
27 "Sandbox.cpp", |
25 "SandboxBrokerClient.cpp", |
28 "SandboxBrokerClient.cpp", |
26 "SandboxFilter.cpp", |
29 "SandboxFilter.cpp", |
27 "SandboxFilterUtil.cpp", |
30 "SandboxFilterUtil.cpp", |
28 "SandboxHooks.cpp", |
31 @@ -83,16 +82,17 @@ UNIFIED_SOURCES += [ |
29 "SandboxInfo.cpp", |
|
30 "SandboxLogging.cpp", |
32 "SandboxLogging.cpp", |
31 "SandboxOpenedFiles.cpp", |
33 "SandboxOpenedFiles.cpp", |
32 "SandboxReporterClient.cpp", |
34 "SandboxReporterClient.cpp", |
33 ] |
35 ] |
34 |
36 |
35 SOURCES += [ |
37 SOURCES += [ |
36 "../chromium/base/strings/safe_sprintf.cc", |
38 "../chromium/base/strings/safe_sprintf.cc", |
37 "../chromium/base/third_party/icu/icu_utf.cc", |
39 "../chromium/base/third_party/icu/icu_utf.cc", |
38 + "../chromium/sandbox/linux/seccomp-bpf/syscall.cc", |
40 + "../chromium/sandbox/linux/bpf_dsl/syscall_set.cc", |
39 "../chromium/sandbox/linux/seccomp-bpf/trap.cc", |
41 "../chromium/sandbox/linux/seccomp-bpf/trap.cc", |
40 "../chromium/sandbox/linux/services/syscall_wrappers.cc", |
42 "../chromium/sandbox/linux/services/syscall_wrappers.cc", |
41 ] |
43 ] |
42 |
44 |
43 # This copy of SafeSPrintf doesn't need to avoid the Chromium logging |
45 # This copy of SafeSPrintf doesn't need to avoid the Chromium logging |
44 # dependency like the one in libxul does, but this way the behavior is |
46 # dependency like the one in libxul does, but this way the behavior is |
45 # consistent. See also the comment in SandboxLogging.h. |
47 # consistent. See also the comment in SandboxLogging.h. |
46 SOURCES["../chromium/base/strings/safe_sprintf.cc"].flags += ["-DNDEBUG"] |
48 SOURCES["../chromium/base/strings/safe_sprintf.cc"].flags += ["-DNDEBUG"] |
47 @@ -105,16 +105,19 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc") |
49 @@ -106,16 +106,19 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc") |
48 "-Wno-unreachable-code-return" |
50 "-Wno-unreachable-code-return" |
49 ] |
51 ] |
50 |
52 |
51 if CONFIG["CC_TYPE"] in ("clang", "gcc"): |
53 if CONFIG["CC_TYPE"] in ("clang", "gcc"): |
52 CXXFLAGS += ["-Wno-error=stack-protector"] |
54 CXXFLAGS += ["-Wno-error=stack-protector"] |