OSDN Git Service

Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs
authorNan Zhang <nanzhang@google.com>
Thu, 7 Jun 2018 02:11:33 +0000 (19:11 -0700)
committerNan Zhang <nanzhang@google.com>
Thu, 7 Jun 2018 20:15:22 +0000 (13:15 -0700)
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

index d52b220..3553f92 100644 (file)
@@ -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