Dist merged system annotation zip
The system-data/annotations.zip was previously generated
by the monolithic system sdk rule. Migrate it over to the
newly introduced modularized/merged target.
Bug: 235140934
Test: m sdk dist && ls out/dist/system-data | grep annotations
Change-Id: I1afc4ef7fdf87555adecdb11296bc07d25193ca2
diff --git a/build/Android.mk b/build/Android.mk
index 886e816..0e82370 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -116,7 +116,7 @@
$(call dist-for-goals,sdk,$(full_target):system-data/api-versions.xml)
# ======= Lint system Annotations zip ===========
-full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-system-stubs_annotations.zip
+full_target := $(call intermediates-dir-for,ETC,sdk-annotations-system.zip)/sdk-annotations-system.zip
$(call dist-for-goals,sdk,$(full_target):system-data/annotations.zip)
# ============ SDK AIDL ============
