diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/Android.bp | 6 | ||||
| -rw-r--r-- | api/ApiDocs.bp | 1 | ||||
| -rw-r--r-- | api/api.go | 3 | ||||
| -rw-r--r-- | api/api_test.go | 9 |
4 files changed, 11 insertions, 8 deletions
diff --git a/api/Android.bp b/api/Android.bp index c7c56861894d..73262030ee37 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -102,7 +102,9 @@ combined_apis { "true": [ "framework-crashrecovery", ], - default: [], + default: [ + "framework-platformcrashrecovery", + ], }) + select(release_flag("RELEASE_RANGING_STACK"), { true: [ "framework-ranging", @@ -385,6 +387,7 @@ stubs_defaults { "--error NoSettingsProvider", "--error UnhiddenSystemApi", "--error UnflaggedApi", + "--error FlaggedApiLiteral", "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*", // Disable CallbackInterface, as Java 8 default interface methods avoid the extensibility // issue interfaces had previously. @@ -473,6 +476,7 @@ java_defaults { impl_library_visibility: ["//frameworks/base"], defaults_visibility: [ "//frameworks/base/location", + "//frameworks/base/packages/CrashRecovery/framework", "//frameworks/base/nfc", ], plugins: ["error_prone_android_framework"], diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp index 1ebe0cdfabd7..89351fd47ff8 100644 --- a/api/ApiDocs.bp +++ b/api/ApiDocs.bp @@ -61,6 +61,7 @@ stubs_defaults { ":framework-bluetooth-sources", ":framework-connectivity-tiramisu-updatable-sources", ":framework-graphics-srcs", + ":framework-healthfitness-sources", ":framework-mediaprovider-sources", ":framework-nearby-sources", ":framework-nfc-updatable-sources", diff --git a/api/api.go b/api/api.go index aa89c2450288..5ca24de1b46a 100644 --- a/api/api.go +++ b/api/api.go @@ -28,6 +28,7 @@ const conscrypt = "conscrypt.module.public.api" const i18n = "i18n.module.public.api" const virtualization = "framework-virtualization" const location = "framework-location" +const platformCrashrecovery = "framework-platformcrashrecovery" var core_libraries_modules = []string{art, conscrypt, i18n} @@ -39,7 +40,7 @@ var core_libraries_modules = []string{art, conscrypt, i18n} // APIs. // In addition, the modules in this list are allowed to contribute to test APIs // stubs. -var non_updatable_modules = []string{virtualization, location} +var non_updatable_modules = []string{virtualization, location, platformCrashrecovery} // The intention behind this soong plugin is to generate a number of "merged" // API-related modules that would otherwise require a large amount of very diff --git a/api/api_test.go b/api/api_test.go index 166f053978f2..28109b5ea2cf 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -78,10 +78,7 @@ func gatherRequiredDepsForTest() string { "stub-annotations", } - extraSdkLibraryModules := []string{ - "framework-virtualization", - "framework-location", - } + extraSdkLibraryModules := non_updatable_modules extraSystemModules := []string{ "core-public-stubs-system-modules", @@ -184,10 +181,10 @@ func gatherRequiredDepsForTest() string { func TestCombinedApisDefaults(t *testing.T) { + testNonUpdatableModules := append(non_updatable_modules, "framework-foo", "framework-bar") result := android.GroupFixturePreparers( prepareForTestWithCombinedApis, - java.FixtureWithLastReleaseApis( - "framework-location", "framework-virtualization", "framework-foo", "framework-bar"), + java.FixtureWithLastReleaseApis(testNonUpdatableModules...), android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.VendorVars = map[string]map[string]string{ "boolean_var": { |