diff options
| author | Jaewoong Jung <jungjw@google.com> | 2018-11-01 15:40:37 -0700 |
|---|---|---|
| committer | Jaewoong Jung <jungjw@google.com> | 2018-11-01 22:45:59 +0000 |
| commit | 5d19e1de88b7ae9e0e9b74212881e11df57a3833 (patch) | |
| tree | 060e251a44734f82bea73a411b54c59e77dbe852 /cc/androidmk.go | |
| parent | ea058fd78c3e790fa555cc9e931dbd205e4e9e24 (diff) | |
| download | android_build_soong-5d19e1de88b7ae9e0e9b74212881e11df57a3833.tar.gz android_build_soong-5d19e1de88b7ae9e0e9b74212881e11df57a3833.tar.bz2 android_build_soong-5d19e1de88b7ae9e0e9b74212881e11df57a3833.zip | |
Export static libraries.
Export static libraries through LOCAL_STATIC_LIBRARIES and
LOCAL_WHOLE_STATIC_LIBRARIES. This enables dependency-based NOTICE file
generation. Also, add a notice property in the libwinpthread module.
Bug: 36073965
Test: cc_test.go
Change-Id: Ic63ca523b40acac82bbe876f7aa40ecd495907c5
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 324b5bc3..69ed7718 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -70,6 +70,12 @@ func (c *Module) AndroidMk() android.AndroidMkData { if len(c.Properties.AndroidMkSharedLibs) > 0 { fmt.Fprintln(w, "LOCAL_SHARED_LIBRARIES := "+strings.Join(c.Properties.AndroidMkSharedLibs, " ")) } + if len(c.Properties.AndroidMkStaticLibs) > 0 { + fmt.Fprintln(w, "LOCAL_STATIC_LIBRARIES := "+strings.Join(c.Properties.AndroidMkStaticLibs, " ")) + } + if len(c.Properties.AndroidMkWholeStaticLibs) > 0 { + fmt.Fprintln(w, "LOCAL_WHOLE_STATIC_LIBRARIES := "+strings.Join(c.Properties.AndroidMkWholeStaticLibs, " ")) + } fmt.Fprintln(w, "LOCAL_SOONG_LINK_TYPE :=", c.getMakeLinkType()) if c.useVndk() { fmt.Fprintln(w, "LOCAL_USE_VNDK := true") |