diff options
| author | Anton Hansson <hansson@google.com> | 2020-05-25 15:25:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-25 15:25:00 +0000 |
| commit | b0033693a89923a80f9973e41b45ddcef2ec7ae9 (patch) | |
| tree | bd6df0aaefec9b0cd871d6eedcd814d9344e7aef | |
| parent | 78b956deb188acd5b5e7365b314da4c5e36c7442 (diff) | |
| parent | 6e9bd96a092b76d46e7e014a6a46226251577cda (diff) | |
Merge "Include annotations in module metalava runs" into rvc-dev
| -rw-r--r-- | apex/Android.bp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index f511af570bb1..7ef3a8294490 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -125,6 +125,10 @@ stubs_defaults { args: mainline_framework_stubs_args, installable: false, sdk_version: "module_current", + annotations_enabled: true, + merge_annotations_dirs: [ + "metalava-manual", + ], filter_packages: framework_packages_to_document, check_api: { current: { @@ -147,6 +151,10 @@ stubs_defaults { libs: ["framework-annotations-lib"], installable: false, sdk_version: "module_current", + annotations_enabled: true, + merge_annotations_dirs: [ + "metalava-manual", + ], filter_packages: framework_packages_to_document, check_api: { current: { @@ -167,6 +175,7 @@ java_defaults { name: "framework-module-stubs-lib-defaults-publicapi", installable: false, sdk_version: "module_current", + libs: [ "stub-annotations" ], dist: { targets: ["sdk", "win_sdk"], dir: "apistubs/android/public", @@ -177,6 +186,7 @@ java_defaults { name: "framework-module-stubs-lib-defaults-systemapi", installable: false, sdk_version: "module_current", + libs: [ "stub-annotations" ], dist: { targets: ["sdk", "win_sdk"], dir: "apistubs/android/system", @@ -187,6 +197,7 @@ java_defaults { name: "framework-module-stubs-lib-defaults-module_libs_api", installable: false, sdk_version: "module_current", + libs: [ "stub-annotations" ], dist: { targets: ["sdk", "win_sdk"], dir: "apistubs/android/module-lib", @@ -204,6 +215,10 @@ stubs_defaults { libs: ["framework-annotations-lib"], installable: false, sdk_version: "module_current", + annotations_enabled: true, + merge_annotations_dirs: [ + "metalava-manual", + ], filter_packages: framework_packages_to_document, check_api: { current: { @@ -226,6 +241,10 @@ stubs_defaults { libs: ["framework-annotations-lib"], installable: false, sdk_version: "module_current", + annotations_enabled: true, + merge_annotations_dirs: [ + "metalava-manual", + ], filter_packages: framework_packages_to_document, } @@ -233,6 +252,10 @@ stubs_defaults { name: "service-module-stubs-srcs-defaults", args: mainline_service_stubs_args, installable: false, + annotations_enabled: true, + merge_annotations_dirs: [ + "metalava-manual", + ], filter_packages: ["com.android."], check_api: { current: { |