commit 03b733c936221067a873c1576fd52cba8aa55f1b
author Nan Zhang <nanzhang@google.com> Tue Jun 26 13:24:05 2018 -0700
committer Nan Zhang <nanzhang@google.com> Tue Jul 24 11:16:56 2018 -0700
tree 46be96bc7631ee27111bf1b9234d0b2781a30e6d
parent e029b28d97e1546bc7340e3e4cb9fe96fccb83cb

Use Metalava based android.jar for SDK

Define LOCAL_DROIDDOC_ANNOTATIONS_ZIP to export zip file.

Test: m out/target/common/obj/PACKAGING/metalava-api-stubs-docs_annotations.zip
Bug: b/78245848
Change-Id: I66ca2a50adc095cc8a8a1a10620427a91480a9bc

java/androidmk.go

diff --git a/java/androidmk.go b/java/androidmk.go
index 5740eca..c6ecfbc 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -304,6 +304,9 @@
 				if ddoc.Javadoc.stubsSrcJar != nil {
 					fmt.Fprintln(w, "LOCAL_DROIDDOC_STUBS_SRCJAR := ", ddoc.Javadoc.stubsSrcJar.String())
 				}
+				if ddoc.annotationsZip != nil {
+					fmt.Fprintln(w, "LOCAL_DROIDDOC_ANNOTATIONS_ZIP := ", ddoc.annotationsZip.String())
+				}
 				if ddoc.checkCurrentApiTimestamp != nil {
 					fmt.Fprintln(w, ".PHONY:", ddoc.Name()+"-check-current-api")
 					fmt.Fprintln(w, ddoc.Name()+"-check-current-api:",