Merge \\\"Don\\\'t specify LOCAL_STRIP_MODULE for static libraries\\\" am: bec7c12043 am: 41f0d7df8b

am: ae39c910a2

Change-Id: I3914efeece7785b1e656505c426b46f8bd562717
This commit is contained in:
Colin Cross
2016-07-07 19:29:00 +00:00
committed by android-build-merger

View File

@@ -79,7 +79,9 @@ func (library *baseLinker) AndroidMk(ret *android.AndroidMkData) {
func (library *libraryLinker) AndroidMk(ret *android.AndroidMkData) {
library.baseLinker.AndroidMk(ret)
library.stripper.AndroidMk(ret)
if !library.static() {
library.stripper.AndroidMk(ret)
}
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
var exportedIncludes []string