diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/StubLibraries.bp | 41 | ||||
| -rw-r--r-- | api/api.go | 2 | ||||
| -rwxr-xr-x | api/gen_combined_removed_dex.sh | 2 |
3 files changed, 26 insertions, 19 deletions
diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index 2f84df70fc40..56a69b46b12c 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -29,11 +29,14 @@ droidstubs { name: "api-stubs-docs-non-updatable", + srcs: [ + ":framework-minus-apex-aconfig-srcjars", + ], defaults: [ "android-non-updatable-stubs-defaults", "module-classpath-stubs-defaults", ], - args: metalava_framework_docs_args + "--error UnflaggedApi ", + args: metalava_framework_docs_args, check_api: { current: { api_file: ":non-updatable-current.txt", @@ -64,6 +67,7 @@ droidstubs { tag: ".removed-api.txt", }, ], + api_surface: "public", } priv_apps = " --show-annotation android.annotation.SystemApi\\(" + @@ -74,8 +78,7 @@ priv_apps_in_stubs = " --show-for-stub-purposes-annotation android.annotation.Sy "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + "\\)" -test = " --show-annotation android.annotation.TestApi" + - " --hide UnflaggedApi" // TODO(b/297362755): TestApi lint doesn't ignore existing APIs. +test = " --show-annotation android.annotation.TestApi" module_libs = " --show-annotation android.annotation.SystemApi\\(" + "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" + @@ -118,6 +121,7 @@ droidstubs { tag: ".removed-api.txt", }, ], + api_surface: "system", } droidstubs { @@ -134,6 +138,7 @@ droidstubs { }, api_lint: { enabled: true, + new_since: ":android.api.test.latest", baseline_file: ":non-updatable-test-lint-baseline.txt", }, }, @@ -163,6 +168,7 @@ droidstubs { tag: ".removed-api.txt", }, ], + api_surface: "test", } droidstubs { @@ -202,6 +208,7 @@ droidstubs { tag: ".removed-api.txt", }, ], + api_surface: "module-lib", } ///////////////////////////////////////////////////////////////////// @@ -378,8 +385,8 @@ java_defaults { java_api_library { name: "android-non-updatable.stubs.from-text", api_surface: "public", - api_files: [ - ":non-updatable-current.txt", + api_contributions: [ + "api-stubs-docs-non-updatable.api.contribution", ], defaults: ["android-non-updatable_from_text_defaults"], full_api_surface_stub: "android_stubs_current.from-text", @@ -388,9 +395,9 @@ java_api_library { java_api_library { name: "android-non-updatable.stubs.system.from-text", api_surface: "system", - api_files: [ - ":non-updatable-current.txt", - ":non-updatable-system-current.txt", + api_contributions: [ + "api-stubs-docs-non-updatable.api.contribution", + "system-api-stubs-docs-non-updatable.api.contribution", ], defaults: ["android-non-updatable_from_text_defaults"], full_api_surface_stub: "android_system_stubs_current.from-text", @@ -399,10 +406,10 @@ java_api_library { java_api_library { name: "android-non-updatable.stubs.test.from-text", api_surface: "test", - api_files: [ - ":non-updatable-current.txt", - ":non-updatable-system-current.txt", - ":non-updatable-test-current.txt", + api_contributions: [ + "api-stubs-docs-non-updatable.api.contribution", + "system-api-stubs-docs-non-updatable.api.contribution", + "test-api-stubs-docs-non-updatable.api.contribution", ], defaults: ["android-non-updatable_from_text_defaults"], full_api_surface_stub: "android_test_stubs_current.from-text", @@ -411,10 +418,10 @@ java_api_library { java_api_library { name: "android-non-updatable.stubs.module_lib.from-text", api_surface: "module_lib", - api_files: [ - ":non-updatable-current.txt", - ":non-updatable-system-current.txt", - ":non-updatable-module-lib-current.txt", + api_contributions: [ + "api-stubs-docs-non-updatable.api.contribution", + "system-api-stubs-docs-non-updatable.api.contribution", + "module-lib-api-stubs-docs-non-updatable.api.contribution", ], defaults: ["android-non-updatable_from_text_defaults"], full_api_surface_stub: "android_module_lib_stubs_current_full.from-text", @@ -612,7 +619,6 @@ java_defaults { name: "android_test_stubs_current_contributions", api_surface: "test", api_contributions: [ - "test-api-stubs-docs-non-updatable.api.contribution", "framework-virtualization.stubs.source.test.api.contribution", "framework-location.stubs.source.test.api.contribution", ], @@ -687,6 +693,7 @@ java_api_library { api_contributions: [ "api-stubs-docs-non-updatable.api.contribution", "system-api-stubs-docs-non-updatable.api.contribution", + "test-api-stubs-docs-non-updatable.api.contribution", ], visibility: ["//visibility:public"], } diff --git a/api/api.go b/api/api.go index 6095a9a781d8..83804c65d81f 100644 --- a/api/api.go +++ b/api/api.go @@ -433,7 +433,7 @@ type bazelCombinedApisAttributes struct { } // combined_apis bp2build converter -func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) { +func (a *CombinedApis) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { basePrefix := "non-updatable" scopeToSuffix := map[string]string{ "public": "-current.txt", diff --git a/api/gen_combined_removed_dex.sh b/api/gen_combined_removed_dex.sh index 9225fe8dfe85..71f366a6aae2 100755 --- a/api/gen_combined_removed_dex.sh +++ b/api/gen_combined_removed_dex.sh @@ -6,6 +6,6 @@ shift 2 # Convert each removed.txt to the "dex format" equivalent, and print all output. for f in "$@"; do - "$metalava_path" --no-banner "$f" --dex-api "${tmp_dir}/tmp" + "$metalava_path" "$f" --dex-api "${tmp_dir}/tmp" cat "${tmp_dir}/tmp" done |