aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-03-25 17:31:43 -0700
committerColin Cross <ccross@android.com>2016-03-29 17:19:26 -0700
commitf9cf41f70331259fdb8ce87a720d851eb2223d3f (patch)
tree1f643fac7ce8fed1f0e785288ad123798e9aa2c3
parent27a0040569ee789dfedb06caa515f8c16bb67440 (diff)
downloadbuild_soong-f9cf41f70331259fdb8ce87a720d851eb2223d3f.tar.gz
build_soong-f9cf41f70331259fdb8ce87a720d851eb2223d3f.tar.bz2
build_soong-f9cf41f70331259fdb8ce87a720d851eb2223d3f.zip
Don't install static libraries
Disable installing static libraries for now by resetting the installer when creating a static library variant. Change-Id: I9360b5c57d95fc0712539accb9450b5fa402fade (cherry picked from commit 7b106e4e9fb13e39ac9a1613a7ddeac3fef2d4b1)
-rw-r--r--cc/cc.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/cc.go b/cc/cc.go
index 251d1cdc..ec26f743 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2174,10 +2174,12 @@ func linkageMutator(mctx common.AndroidBottomUpMutatorContext) {
if linker.buildStatic() && linker.buildShared() {
modules = mctx.CreateLocalVariations("static", "shared")
modules[0].(*Module).linker.(baseLinkerInterface).setStatic(true)
+ modules[0].(*Module).installer = nil
modules[1].(*Module).linker.(baseLinkerInterface).setStatic(false)
} else if linker.buildStatic() {
modules = mctx.CreateLocalVariations("static")
modules[0].(*Module).linker.(baseLinkerInterface).setStatic(true)
+ modules[0].(*Module).installer = nil
} else if linker.buildShared() {
modules = mctx.CreateLocalVariations("shared")
modules[0].(*Module).linker.(baseLinkerInterface).setStatic(false)