summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorjiangj <jiangj@opera.com>2015-04-18 06:29:06 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-18 13:29:23 +0000
commit2bd42fdbfab81b645ac926bd115e2a0762426b64 (patch)
treedbeba7e0f690aa4ed0efc41c223e4fa5a892e4b6 /sandbox
parent611f311a54cdba7a14bc3c15a0f9a17493cfbd1d (diff)
downloadchromium_src-2bd42fdbfab81b645ac926bd115e2a0762426b64.zip
chromium_src-2bd42fdbfab81b645ac926bd115e2a0762426b64.tar.gz
chromium_src-2bd42fdbfab81b645ac926bd115e2a0762426b64.tar.bz2
Reland: Fix errors found in Mac gn component builds
This is relanding https://codereview.chromium.org/1087873003 which was reverted in https://codereview.chromium.org/1089773003/. Mac gn component build fail because of missing frameworks and missing some other dependencies, and occasionally file list out of sync with the gyp counterpart: http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_dbg/builds/321/steps/compile/logs/stdio For instance, the frameworks linked in the components that sync depends on is not automatically linked into sync, thus revealing the issue. BUG=477710 Review URL: https://codereview.chromium.org/1098513002 Cr-Commit-Position: refs/heads/master@{#325771}
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/mac/BUILD.gn75
1 files changed, 38 insertions, 37 deletions
diff --git a/sandbox/mac/BUILD.gn b/sandbox/mac/BUILD.gn
index daee138..d74bfcb 100644
--- a/sandbox/mac/BUILD.gn
+++ b/sandbox/mac/BUILD.gn
@@ -5,43 +5,6 @@
import("//build/config/mac/mac_sdk.gni")
import("//testing/test.gni")
-component("sandbox") {
- sources = [
- "bootstrap_sandbox.cc",
- "bootstrap_sandbox.h",
- "dispatch_source_mach.cc",
- "dispatch_source_mach.h",
- "launchd_interception_server.cc",
- "launchd_interception_server.h",
- "mach_message_server.cc",
- "mach_message_server.h",
- "message_server.h",
- "os_compatibility.cc",
- "os_compatibility.h",
- "policy.cc",
- "policy.h",
- "xpc.cc",
- "xpc.h",
- "xpc_message_server.cc",
- "xpc_message_server.h",
- ]
-
- defines = [ "SANDBOX_IMPLEMENTATION" ]
- libs = [ "bsm" ]
-
- deps = [
- "//base",
- ]
-
- # When the build SDK is 10.6, generate a dynamic stub loader. When the
- # SDK is higher, then libxpc.dylib will be loaded automatically as part
- # of libSystem, and only forward declarations of private symbols are
- # necessary.
- if (mac_sdk_version == "10.6") {
- deps += [ ":generate_stubs" ]
- }
-}
-
generate_stubs_script = "//tools/generate_stubs/generate_stubs.py"
generate_stubs_header = "xpc_stubs_header.fragment"
generate_stubs_sig_public = "xpc_stubs.sig"
@@ -81,6 +44,44 @@ action("generate_stubs") {
args += rebase_path(sources, root_build_dir)
}
+component("sandbox") {
+ sources = [
+ "bootstrap_sandbox.cc",
+ "bootstrap_sandbox.h",
+ "dispatch_source_mach.cc",
+ "dispatch_source_mach.h",
+ "launchd_interception_server.cc",
+ "launchd_interception_server.h",
+ "mach_message_server.cc",
+ "mach_message_server.h",
+ "message_server.h",
+ "os_compatibility.cc",
+ "os_compatibility.h",
+ "policy.cc",
+ "policy.h",
+ "xpc.cc",
+ "xpc.h",
+ "xpc_message_server.cc",
+ "xpc_message_server.h",
+ ]
+
+ defines = [ "SANDBOX_IMPLEMENTATION" ]
+ libs = [ "bsm" ]
+
+ deps = [
+ "//base",
+ ]
+
+ # When the build SDK is 10.6, generate a dynamic stub loader. When the
+ # SDK is higher, then libxpc.dylib will be loaded automatically as part
+ # of libSystem, and only forward declarations of private symbols are
+ # necessary.
+ if (mac_sdk_version == "10.6") {
+ deps += [ ":generate_stubs" ]
+ sources += get_target_outputs(":generate_stubs")
+ }
+}
+
test("sandbox_mac_unittests") {
sources = [
"bootstrap_sandbox_unittest.mm",