diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/StubLibraries.bp | 16 | ||||
| -rw-r--r-- | api/api.go | 7 |
2 files changed, 21 insertions, 2 deletions
diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index 9a0053f8add6..22cc0593bc47 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -483,6 +483,22 @@ java_library { } java_library { + name: "android_test_frameworks_core_stubs_current.from-source", + static_libs: [ + "all-updatable-modules-system-stubs", + "android-non-updatable.stubs.test", + "private-stub-annotations-jar", + ], + defaults: [ + "android.jar_defaults", + "android_stubs_dists_default", + ], + dist: { + dir: "apistubs/android/test-core", + }, +} + +java_library { name: "android_module_lib_stubs_current.from-source", defaults: [ "android.jar_defaults", diff --git a/api/api.go b/api/api.go index c568a45de5d0..d5c6145ba062 100644 --- a/api/api.go +++ b/api/api.go @@ -110,6 +110,7 @@ type defaultsProps struct { Api_surface *string Api_contributions []string Defaults_visibility []string + Previous_api *string } type Bazel_module struct { @@ -145,7 +146,7 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) { metalavaCmd := "$(location metalava)" // Silence reflection warnings. See b/168689341 metalavaCmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED " - metalavaCmd += " --quiet --no-banner --format=v2 " + metalavaCmd += " --quiet merge-signatures --format=v2 " filename := txt.TxtFilename if txt.Scope != "public" { @@ -155,7 +156,7 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) { props.Name = proptools.StringPtr(ctx.ModuleName() + "-" + filename) props.Tools = []string{"metalava"} props.Out = []string{filename} - props.Cmd = proptools.StringPtr(metalavaCmd + "$(in) --api $(out)") + props.Cmd = proptools.StringPtr(metalavaCmd + "$(in) --out $(out)") props.Srcs = append([]string{txt.BaseTxt}, createSrcs(txt.Modules, txt.ModuleTag)...) props.Dists = []android.Dist{ { @@ -359,6 +360,7 @@ func createApiContributionDefaults(ctx android.LoadHookContext, modules []string props.Api_contributions = transformArray( modules, "", fmt.Sprintf(".stubs.source%s.api.contribution", apiSuffix)) props.Defaults_visibility = []string{"//visibility:public"} + props.Previous_api = proptools.StringPtr(":android.api.public.latest") ctx.CreateModule(java.DefaultsFactory, &props) } } @@ -368,6 +370,7 @@ func createFullApiLibraries(ctx android.LoadHookContext) { "android_stubs_current", "android_system_stubs_current", "android_test_stubs_current", + "android_test_frameworks_core_stubs_current", "android_module_lib_stubs_current", "android_system_server_stubs_current", } |