diff options
| author | Colin Cross <ccross@android.com> | 2017-02-16 16:05:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-16 16:05:20 +0000 |
| commit | 449887957cab752f993b55cc5ffe72afed9a4420 (patch) | |
| tree | 6fdee56640b78f444686287d728c876f189e1173 /cc | |
| parent | 367a7da041d7aabe9a68dc4bd404429266d281bd (diff) | |
| parent | 4ac44809af32cf6142026d0d9ea435d98124d6cd (diff) | |
| download | build_soong-449887957cab752f993b55cc5ffe72afed9a4420.tar.gz build_soong-449887957cab752f993b55cc5ffe72afed9a4420.tar.bz2 build_soong-449887957cab752f993b55cc5ffe72afed9a4420.zip | |
Merge "Export header libraries to make as static libraries"
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/androidmk.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 198c6106..ac1a55da 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -81,14 +81,14 @@ func (c *Module) AndroidMk() (ret android.AndroidMkData, err error) { } func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { - if !library.static() { + if library.shared() { ctx.subAndroidMk(ret, &library.stripper) ctx.subAndroidMk(ret, &library.relocationPacker) } - if library.static() { + if library.static() || library.header() { ret.Class = "STATIC_LIBRARIES" - } else { + } else if library.shared() { ret.Class = "SHARED_LIBRARIES" } @@ -118,7 +118,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An return nil }) - if !library.static() { + if library.shared() { ctx.subAndroidMk(ret, library.baseInstaller) } } |