aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2019-05-17 20:57:37 -0500
committerGerrit Code Review2019-05-17 20:57:37 -0500
commit288a1e2957d3474ccfe95ee096441fa64ad70c24 (patch)
tree5e179ee2473acf83a554272a3b3596b9e7fd549a
parent045f0f1f307861edf75eff657a058d877c3e1b0b (diff)
parentee3ea31a244d65ecac2e5816132db311dcfe24df (diff)
downloadplatform-build-soong-288a1e2957d3474ccfe95ee096441fa64ad70c24.tar.gz
platform-build-soong-288a1e2957d3474ccfe95ee096441fa64ad70c24.tar.xz
platform-build-soong-288a1e2957d3474ccfe95ee096441fa64ad70c24.zip
Merge "Limit calls to strip.sh on darwin"
-rw-r--r--cc/builder.go13
1 files changed, 13 insertions, 0 deletions
diff --git a/cc/builder.go b/cc/builder.go
index c99e4618..8d09a99e 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -123,12 +123,25 @@ var (
123 _ = pctx.SourcePathVariable("stripPath", "build/soong/scripts/strip.sh") 123 _ = pctx.SourcePathVariable("stripPath", "build/soong/scripts/strip.sh")
124 _ = pctx.SourcePathVariable("xzCmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/xz") 124 _ = pctx.SourcePathVariable("xzCmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/xz")
125 125
126 // b/132822437: objcopy uses a file descriptor per .o file when called on .a files, which runs the system out of
127 // file descriptors on darwin. Limit concurrent calls to 10 on darwin.
128 darwinStripPool = func() blueprint.Pool {
129 if runtime.GOOS == "darwin" {
130 return pctx.StaticPool("darwinStripPool", blueprint.PoolParams{
131 Depth: 10,
132 })
133 } else {
134 return nil
135 }
136 }()
137
126 strip = pctx.AndroidStaticRule("strip", 138 strip = pctx.AndroidStaticRule("strip",
127 blueprint.RuleParams{ 139 blueprint.RuleParams{
128 Depfile: "${out}.d", 140 Depfile: "${out}.d",
129 Deps: blueprint.DepsGCC, 141 Deps: blueprint.DepsGCC,
130 Command: "CROSS_COMPILE=$crossCompile XZ=$xzCmd CLANG_BIN=${config.ClangBin} $stripPath ${args} -i ${in} -o ${out} -d ${out}.d", 142 Command: "CROSS_COMPILE=$crossCompile XZ=$xzCmd CLANG_BIN=${config.ClangBin} $stripPath ${args} -i ${in} -o ${out} -d ${out}.d",
131 CommandDeps: []string{"$stripPath", "$xzCmd"}, 143 CommandDeps: []string{"$stripPath", "$xzCmd"},
144 Pool: darwinStripPool,
132 }, 145 },
133 "args", "crossCompile") 146 "args", "crossCompile")
134 147