commit 10f7c4a26897689dcc73223bdc28508eed155641
author Colin Cross <ccross@android.com> Wed May 23 10:59:28 2018 -0700
committer Colin Cross <ccross@android.com> Thu May 24 15:24:12 2018 -0700
tree c0341fc4f493bc510a49e97b71fdb8ae55067949
parent ae5caf554cb01b2bc73130dfe99c9f5a475b03d9

Export manifest to Make

I5d439353d46ba6659ec8d16967693d2b9e62ab5a will need the manifests
from android libraries to merge into modules that reference them
with LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 3434784
Test: m checkbuild
Change-Id: I47b9def5b9c2ecc423550eb8a988cce96038a81e

java/androidmk.go

diff --git a/java/androidmk.go b/java/androidmk.go
index bc9544a..0840198 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -136,6 +136,7 @@
 				fmt.Fprintln(w, "LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=", prebuilt.exportPackage.String())
 				fmt.Fprintln(w, "LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=", prebuilt.proguardFlags.String())
 				fmt.Fprintln(w, "LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=", prebuilt.extraAaptPackagesFile.String())
+				fmt.Fprintln(w, "LOCAL_FULL_MANIFEST_FILE :=", prebuilt.manifest.String())
 				fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", String(prebuilt.properties.Sdk_version))
 			},
 		},