commit 77a8b394eef4e9f613e5b99685f0a0a5d024aa48
author Nan Zhang <nanzhang@google.com> Tue Jun 26 13:21:14 2018 -0700
committer Nan Zhang <nanzhang@google.com> Tue Jun 26 13:25:18 2018 -0700
tree c53d1240000716ac33b51cc794f55871aad61922
parent 875691cf895c6fb13c2eec0d65d7b8cd3674548f

Copy annotations.zip to out/target/common/obj/PACKAGING/

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

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 5051ef7..c1c1bb8 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -252,6 +252,7 @@
 LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=
 LOCAL_DROIDDOC_STUBS_SRCJAR :=
 LOCAL_DROIDDOC_DOC_ZIP :=
+LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=
 # '',true
 LOCAL_SOURCE_FILES_ALL_GENERATED:=
 LOCAL_SRC_FILES:=

core/soong_java_prebuilt.mk

diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index 0ba2c7a..fde8a04 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -33,6 +33,10 @@
 $(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)
 endif
 
+ifdef LOCAL_DROIDDOC_ANNOTATIONS_ZIP
+$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_ANNOTATIONS_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip))
+endif
+
 ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
   $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
     $(intermediates.COMMON)/jacoco-report-classes.jar))