From c3b1a166d2d11a3bf4b690c54f0bfe6b460949d3 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Tue, 18 Feb 2020 12:42:54 +0900 Subject: [PATCH] Fix build error on vendor_snapshot_static Without this, Makefile wasn't able to link against vendor_snapshot_static library. Bug: 149252327 Test: manual linking Change-Id: Idd65656b58d12f8489827df081ef08e40ceb5af9 --- cc/androidmk.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index d8210fc9b..ac611e8cc 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -455,19 +455,21 @@ func (c *vendorSnapshotLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret *an ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { c.libraryDecorator.androidMkWriteExportedFlags(w) - if c.shared() { + if c.shared() || c.static() { path, file := filepath.Split(c.path.ToMakePath().String()) stem, suffix, ext := android.SplitFileExt(file) fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+ext) fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+suffix) + fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem) if c.shared() { fmt.Fprintln(w, "LOCAL_MODULE_PATH := "+path) - fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem) } if c.tocFile.Valid() { fmt.Fprintln(w, "LOCAL_SOONG_TOC := "+c.tocFile.String()) } - } else { // static or header + } + + if !c.shared() { // static or header fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true") } })