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 /android/androidmk.go | |
| parent | ea058fd78c3e790fa555cc9e931dbd205e4e9e24 (diff) | |
| download | build_soong-5d19e1de88b7ae9e0e9b74212881e11df57a3833.tar.gz build_soong-5d19e1de88b7ae9e0e9b74212881e11df57a3833.tar.bz2 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 'android/androidmk.go')
| -rw-r--r-- | android/androidmk.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index 70305231..493ba97e 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -275,9 +275,10 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, mod blueprint.Mod if amod.commonProperties.Owner != nil { fmt.Fprintln(&data.preamble, "LOCAL_MODULE_OWNER :=", *amod.commonProperties.Owner) } - if amod.commonProperties.Notice != nil { - fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", "$(LOCAL_PATH)/"+*amod.commonProperties.Notice) - } + } + + if amod.commonProperties.Notice != nil { + fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", "$(LOCAL_PATH)/"+*amod.commonProperties.Notice) } if host { |