summaryrefslogtreecommitdiff
path: root/android/androidmk.go
diff options
context:
space:
mode:
author Jaewoong Jung <jungjw@google.com> 2018-11-16 15:05:07 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-11-16 15:05:07 +0000
commit485e6ebb4c0a7949a70dd25ffe812c20c9f1c8e2 (patch)
tree85bada956c543bc11bd373a34d9ff9dd0a44f339 /android/androidmk.go
parent8ba38f45ac50c4637e1823b09f9d352442eb3f23 (diff)
parent16c7d3d26308225c2456232f945adf3f74f1673a (diff)
Merge "Revert "Revert "Revert "Revert "Export static libraries."""""
Diffstat (limited to 'android/androidmk.go')
-rw-r--r--android/androidmk.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/android/androidmk.go b/android/androidmk.go
index 703052315..493ba97e4 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 {