commit 555c1142838937c63b7cfd5a4a757c7d39d4422f
author Jaewoong Jung <jungjw@google.com> Fri Nov 09 22:25:37 2018 +0000
committer Jaewoong Jung <jungjw@google.com> Fri Nov 09 22:25:37 2018 +0000
tree 67f233db37a0e2bdaf995d0550eed822ddc315ac
parent eb05c2a633ba6ceafcd7fd4dfd7382127dc86fec

Revert "Revert "Revert "Export static libraries."""

This reverts commit eb05c2a633ba6ceafcd7fd4dfd7382127dc86fec.

Reason for revert: Yet another broken build.

Change-Id: I4198f2dd5c7848365d71d03f6dbd598998fb9bd8

android/androidmk.go

diff --git a/android/androidmk.go b/android/androidmk.go
index 493ba97..7030523 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -275,10 +275,9 @@
 		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 {