summaryrefslogtreecommitdiff
path: root/android/androidmk.go
diff options
context:
space:
mode:
author Jaewoong Jung <jungjw@google.com> 2018-11-16 01:19:56 +0000
committer Jaewoong Jung <jungjw@google.com> 2018-11-16 01:20:05 +0000
commit16c7d3d26308225c2456232f945adf3f74f1673a (patch)
tree5af4aecf130f59d9c515a68be201566b3ffc7d2f /android/androidmk.go
parentc508121448c25eeb91a044b6adfb7e0f5401f0ac (diff)
Revert "Revert "Revert "Revert "Export static libraries.""""
This reverts commit 555c1142838937c63b7cfd5a4a757c7d39d4422f. Reason for revert: The namespace issue in the pi-dev-plus-aosp-without-vendor branch is now fixed. Change-Id: I26ed591447797a8ee505f43bdd209162418b6c5e
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 {