diff options
| author | Anton Hansson <hansson@google.com> | 2020-05-25 15:45:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-25 15:45:32 +0000 |
| commit | a264b2b9aaa4ff3d93c5c33bcb37fcdb47a70c83 (patch) | |
| tree | fc76c3e3ffd9800205dc1ec8ab0f0cf7fe06e1f1 /apex | |
| parent | 5ab24e74da709e96a3c3e88102c916e6929ad74d (diff) | |
| parent | b0033693a89923a80f9973e41b45ddcef2ec7ae9 (diff) | |
Merge "Include annotations in module metalava runs" into rvc-dev am: b0033693a8
Change-Id: Ibb47b41b065f59f372e17be002c265087ffa2347
Diffstat (limited to 'apex')
| -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 8c4fccad63b4..4c1f88b0b4bf 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, // Do not generate stubs as they are not needed @@ -230,6 +245,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, } @@ -237,6 +256,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: { |