Merge "Include annotations in module metalava runs" into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b0033693a8
@@ -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,
|
||||||
check_api: {
|
check_api: {
|
||||||
current: {
|
current: {
|
||||||
@@ -226,6 +241,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,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,6 +252,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: {
|
||||||
|
|||||||
Reference in New Issue
Block a user