From b3871a64ac4730889578ece82028b0471285a333 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Wed, 6 Jun 2018 19:11:33 -0700 Subject: [PATCH] Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs Test: manually cp stub-annotations.jar to pi-dev; and m -j metalava_android_stubs Bug: b/78245848 Change-Id: Ib7ea5d847d50e3c863891e0f59228a40d1b8c41b Merged-In: I116643925a3a9594e8590c3714e93d0fb0ac372f --- Android.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Android.mk b/Android.mk index d52b220fc6d0d..3553f92ae5e74 100644 --- a/Android.mk +++ b/Android.mk @@ -374,6 +374,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) LOCAL_MODULE := metalava-api-stubs LOCAL_DROIDDOC_USE_METALAVA := true +LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt +LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true +LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/src @@ -445,6 +448,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) LOCAL_MODULE := metalava-system-api-stubs LOCAL_DROIDDOC_USE_METALAVA := true +LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt +LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true +LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_system_stubs_current_intermediates/src @@ -518,6 +524,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) LOCAL_MODULE := metalava-test-api-stubs LOCAL_DROIDDOC_USE_METALAVA := true +LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt +LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true +LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_test_stubs_current_intermediates/src