StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Export header libraries to make as static libraries"

Browse Source
This commit is contained in:
Colin Cross
2017-02-16 16:05:19 +00:00
committed by Gerrit Code Review
parent 367a7da041 4ac44809af
commit 449887957c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/androidmk.go
View File

@@ -81,14 +81,14 @@ func (c *Module) AndroidMk() (ret android.AndroidMkData, err error) {
} }
func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
if !library.static() { if library.shared() {
ctx.subAndroidMk(ret, &library.stripper) ctx.subAndroidMk(ret, &library.stripper)
ctx.subAndroidMk(ret, &library.relocationPacker) ctx.subAndroidMk(ret, &library.relocationPacker)
} }
if library.static() { if library.static() || library.header() {
ret.Class = "STATIC_LIBRARIES" ret.Class = "STATIC_LIBRARIES"
} else { } else if library.shared() {
ret.Class = "SHARED_LIBRARIES" ret.Class = "SHARED_LIBRARIES"
} }
@@ -118,7 +118,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An
return nil return nil
}) })
if !library.static() { if library.shared() {
ctx.subAndroidMk(ret, library.baseInstaller) ctx.subAndroidMk(ret, library.baseInstaller)
} }
} }