From 7b5c22b1f0e4808ef8c740cdd488e0e26a425cd1 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 7 Jul 2016 11:16:20 -0700 Subject: [PATCH] Don't specify LOCAL_STRIP_MODULE for static libraries After I92a838b07fe4116d5a4b8521fe1ce8d44e6e84e2 in build/, LOCAL_STRIP_MODULE := keep_symbols will be honored for prebuilts, which will trigger an error if it is set on a static library. Only set LOCAL_STRIP_MODULE for binaries and shared libraries. Change-Id: I4e17a78afa7c5810dbf9003166c14a1ff3a59c9e --- cc/androidmk.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index 499736dce..95250a64d 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -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