From f9cf41f70331259fdb8ce87a720d851eb2223d3f Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 25 Mar 2016 17:31:43 -0700 Subject: 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) --- cc/cc.go | 2 ++ 1 file changed, 2 insertions(+) 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) -- cgit v1.2.3