Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev

Browse Source
This commit is contained in:
Nan Zhang
2018-06-08 17:28:37 +00:00
committed by Android (Google) Code Review
parent c5b828df68 b3871a64ac
commit cb3dd2889c
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android.mk
View File

@@ -374,6 +374,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
LOCAL_MODULE := metalava-api-stubs LOCAL_MODULE := metalava-api-stubs
LOCAL_DROIDDOC_USE_METALAVA := true 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 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_MODULE := metalava-system-api-stubs
LOCAL_DROIDDOC_USE_METALAVA := true 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 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_MODULE := metalava-test-api-stubs
LOCAL_DROIDDOC_USE_METALAVA := true 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 LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_test_stubs_current_intermediates/src