commit 3e6b1fbcfb3bc0bafae11ddad666745db8a68a92
author Jaewoong Jung <jungjw@google.com> Fri Nov 02 22:56:30 2018 +0000
committer Jaewoong Jung <jungjw@google.com> Fri Nov 02 22:56:30 2018 +0000
tree 632ecfb69688dc2d8442306dbf932e5ece19be0f
parent 5d19e1de88b7ae9e0e9b74212881e11df57a3833

Revert "Export static libraries."

This reverts commit 5d19e1de88b7ae9e0e9b74212881e11df57a3833.

Reason for revert: Broke aosp-build-tools/darwin_mac

Change-Id: I1af36848fb5a00849aec69941ddef33769b1b536

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 {

android/config.go

diff --git a/android/config.go b/android/config.go
index 928d07a..695a298 100644
--- a/android/config.go
+++ b/android/config.go
@@ -238,9 +238,6 @@
 			{BuildOs, Arch{ArchType: X86_64}},
 			{BuildOs, Arch{ArchType: X86}},
 		},
-		Windows: []Target{
-			{Windows, Arch{ArchType: X86}},
-		},
 	}
 
 	config.BuildOsVariant = config.Targets[BuildOs][0].String()