From 16c7d3d26308225c2456232f945adf3f74f1673a Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Fri, 16 Nov 2018 01:19:56 +0000 Subject: 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 --- android/androidmk.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'android/androidmk.go') 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 { -- cgit v1.2.3-59-g8ed1b