commit 71a70eff1969528175cebb363eebd93982419b5b
author The Android Automerger <android-build@google.com> Wed Mar 30 00:02:43 2016 -0700
committer The Android Automerger <android-build@google.com> Wed Mar 30 00:02:43 2016 -0700
tree a20eea96282deb94c7ebe0c72a7c11ea3c297ffe
parent 27a0040569ee789dfedb06caa515f8c16bb67440
parent 90f0bd36fc1ac120207ad00ad28b06449caf1636

merge in nyc-release history after reset to nyc-dev

common/androidmk.go

diff --git a/common/androidmk.go b/common/androidmk.go
index a16a652..77a98cb 100644
--- a/common/androidmk.go
+++ b/common/androidmk.go
@@ -192,6 +192,9 @@
 			fmt.Fprintln(w, "LOCAL_MODULE_HOST_CROSS_ARCH :=", archStr)
 		} else {
 			fmt.Fprintln(w, "LOCAL_MODULE_HOST_ARCH :=", archStr)
+
+			// TODO: this isn't true for every module, only dependencies of ACP
+			fmt.Fprintln(w, "LOCAL_ACP_UNAVAILABLE := true")
 		}
 		fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", amod.HostType().String())
 		fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")