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

Merge "Include annotations in module metalava runs" into rvc-dev am: b0033693a8

Browse Source 
Change-Id: Ibb47b41b065f59f372e17be002c265087ffa2347
This commit is contained in:
Anton Hansson
2020-05-25 15:45:32 +00:00
committed by Automerger Merge Worker
parent 5ab24e74da b0033693a8
commit a264b2b9aa
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apex/Android.bp
View File

@@ -125,6 +125,10 @@ stubs_defaults {
args: mainline_framework_stubs_args, args: mainline_framework_stubs_args,
installable: false, installable: false,
sdk_version: "module_current", sdk_version: "module_current",
annotations_enabled: true,
merge_annotations_dirs: [
"metalava-manual",
],
filter_packages: framework_packages_to_document, filter_packages: framework_packages_to_document,
check_api: { check_api: {
current: { current: {
@@ -147,6 +151,10 @@ stubs_defaults {
libs: ["framework-annotations-lib"], libs: ["framework-annotations-lib"],
installable: false, installable: false,
sdk_version: "module_current", sdk_version: "module_current",
annotations_enabled: true,
merge_annotations_dirs: [
"metalava-manual",
],
filter_packages: framework_packages_to_document, filter_packages: framework_packages_to_document,
check_api: { check_api: {
current: { current: {
@@ -167,6 +175,7 @@ java_defaults {
name: "framework-module-stubs-lib-defaults-publicapi", name: "framework-module-stubs-lib-defaults-publicapi",
installable: false, installable: false,
sdk_version: "module_current", sdk_version: "module_current",
libs: [ "stub-annotations" ],
dist: { dist: {
targets: ["sdk", "win_sdk"], targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public", dir: "apistubs/android/public",
@@ -177,6 +186,7 @@ java_defaults {
name: "framework-module-stubs-lib-defaults-systemapi", name: "framework-module-stubs-lib-defaults-systemapi",
installable: false, installable: false,
sdk_version: "module_current", sdk_version: "module_current",
libs: [ "stub-annotations" ],
dist: { dist: {
targets: ["sdk", "win_sdk"], targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system", dir: "apistubs/android/system",
@@ -187,6 +197,7 @@ java_defaults {
name: "framework-module-stubs-lib-defaults-module_libs_api", name: "framework-module-stubs-lib-defaults-module_libs_api",
installable: false, installable: false,
sdk_version: "module_current", sdk_version: "module_current",
libs: [ "stub-annotations" ],
dist: { dist: {
targets: ["sdk", "win_sdk"], targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib", dir: "apistubs/android/module-lib",
@@ -204,6 +215,10 @@ stubs_defaults {
libs: ["framework-annotations-lib"], libs: ["framework-annotations-lib"],
installable: false, installable: false,
sdk_version: "module_current", sdk_version: "module_current",
annotations_enabled: true,
merge_annotations_dirs: [
"metalava-manual",
],
filter_packages: framework_packages_to_document, filter_packages: framework_packages_to_document,
// Do not generate stubs as they are not needed // Do not generate stubs as they are not needed
@@ -230,6 +245,10 @@ stubs_defaults {
libs: ["framework-annotations-lib"], libs: ["framework-annotations-lib"],
installable: false, installable: false,
sdk_version: "module_current", sdk_version: "module_current",
annotations_enabled: true,
merge_annotations_dirs: [
"metalava-manual",
],
filter_packages: framework_packages_to_document, filter_packages: framework_packages_to_document,
} }
@@ -237,6 +256,10 @@ stubs_defaults {
name: "service-module-stubs-srcs-defaults", name: "service-module-stubs-srcs-defaults",
args: mainline_service_stubs_args, args: mainline_service_stubs_args,
installable: false, installable: false,
annotations_enabled: true,
merge_annotations_dirs: [
"metalava-manual",
],
filter_packages: ["com.android."], filter_packages: ["com.android."],
check_api: { check_api: {
current: { current: {