From 3669711d873cb07a6385394b41b13f72211964c3 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 2 Jul 2018 14:04:10 -0700
Subject: [PATCH] Include annotations in metalava stubs

Pass --include-annotation-classes tools/metalava/stub-annotations
to metalava so that the stubs end up in the final jar.  They will be
post-processed with metalava --rewrite-annotations to avoid affecting
the public SDK.

Bug: 110532131
Test: m out/target/common/obj/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/classes.jar
Change-Id: Icb9268a72aa7de82ed6ad88aef9ac813796f9bf9
Merged-In: I116643925a3a9594e8590c3714e93d0fb0ac372f
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 25d8fc61c2ae9..bdad6c3d14832 100644
--- a/Android.mk
+++ b/Android.mk
@@ -264,7 +264,8 @@ framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS := \
     --hide RequiresPermission \
     --hide MissingPermission --hide BroadcastBehavior \
     --hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol \
-    --hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo
+    --hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo \
+    --include-annotation-classes tools/metalava/stub-annotations \
 
 # ====  Public API diff ===========================
 include $(CLEAR_VARS)