commit 0c40b60640208854985f5d02d5bbd736ed5f4749
author Colin Cross <ccross@android.com> Mon Jul 06 11:20:07 2020 -0700
committer Colin Cross <ccross@android.com> Mon Jul 06 11:20:07 2020 -0700
tree ad416094cf78ceb375e9de5491025cca5aa534a6
parent 86b1847e6c280e6e84c970620afdd0a8dd1d1046

dist annotations.zip and api-versions.xml

Lint in unbundled builds will require annotations.zip and api-versions.xml
in prebuilts/sdk.

Bug: 153485543
Test: forrest
Change-Id: Ice23230c57b9ed30541a6dcb6f507b765e6a03fe

build/Android.mk

diff --git a/build/Android.mk b/build/Android.mk
index d18a2d7..220fee7 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -113,10 +113,14 @@
 ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
 
 # ======= Lint API XML ===========
-ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml
+ALL_SDK_FILES += $(full_target)
+$(call dist-for-goals,sdk win_sdk,$(full_target):data/api-versions.xml)
 
 # ======= Lint Annotations zip ===========
-ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_annotations.zip
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_annotations.zip
+ALL_SDK_FILES += $(full_target)
+$(call dist-for-goals,sdk win_sdk,$(full_target):data/annotations.zip)
 
 # ============ SDK AIDL ============
 $(eval $(call copy-one-file,$(FRAMEWORK_AIDL),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl))