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

Include annotations in module metalava runs

Browse Source 
Without this, we don't get nullability annotations in the stub sources,
nor the stubs themselves, which is a requirement for good interop with
kotlin.

Bug: 157010342
Test: m
Test: javap -c -v out/soong/.intermediates/frameworks/base/apex/media/\
framework/framework-media-stubs-publicapi/android_common/javac/classes/\
android/media/MediaSession2.class | grep Null && echo success || echo fail

Change-Id: I60c82e0fd495d379d7107e43542b846ca50b1e96
Merged-In: I60c82e0fd495d379d7107e43542b846ca50b1e96
This commit is contained in:
Anton Hansson
2020-05-20 11:51:22 +01:00
parent 6f646a5f13
commit 8e4f83b9eb
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

@@ -137,6 +137,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: {
@@ -152,6 +156,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: {
@@ -165,6 +173,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",
@@ -175,6 +184,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",
@@ -185,6 +195,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",
@@ -202,6 +213,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
@@ -221,6 +236,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,
}
@@ -228,6 +247,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: {