diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-06-08 17:28:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-08 17:28:37 +0000 |
| commit | cb3dd2889cba3759f6a8392d9cccb37702186b18 (patch) | |
| tree | 64abad5fe46f5f27fb6abb94eeac4bff0238db40 | |
| parent | c5b828df68460fac58964222d0c4b805e63e4081 (diff) | |
| parent | b3871a64ac4730889578ece82028b0471285a333 (diff) | |
| download | base-cb3dd2889cba3759f6a8392d9cccb37702186b18.tar.gz | |
Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index d52b220fc6d0..3553f92ae5e7 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 |