diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/Android.bp | 21 | ||||
| -rw-r--r-- | api/ApiDocs.bp | 1 | ||||
| -rw-r--r-- | api/api.go | 4 | ||||
| -rw-r--r-- | api/api_test.go | 9 |
4 files changed, 26 insertions, 9 deletions
diff --git a/api/Android.bp b/api/Android.bp index c7c56861894d..14c2766d8887 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -102,7 +102,16 @@ combined_apis { "true": [ "framework-crashrecovery", ], - default: [], + default: [ + "framework-platformcrashrecovery", + ], + }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), { + true: [ + "framework-ondeviceintelligence", + ], + default: [ + "framework-ondeviceintelligence-platform", + ], }) + select(release_flag("RELEASE_RANGING_STACK"), { true: [ "framework-ranging", @@ -117,7 +126,12 @@ combined_apis { "service-permission", "service-rkp", "service-sdksandbox", - ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + ] + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), { + true: [ + "service-ondeviceintelligence", + ], + default: [], + }) + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { "true": [ "service-crashrecovery", ], @@ -385,6 +399,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,7 +488,9 @@ java_defaults { impl_library_visibility: ["//frameworks/base"], defaults_visibility: [ "//frameworks/base/location", + "//frameworks/base/packages/CrashRecovery/framework", "//frameworks/base/nfc", + "//packages/modules/NeuralNetworks:__subpackages__", ], plugins: ["error_prone_android_framework"], errorprone: { diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp index 796c8412b26c..03fb44fd8145 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 da75e05673e2..640773be0f9b 100644 --- a/api/api.go +++ b/api/api.go @@ -28,6 +28,8 @@ const conscrypt = "conscrypt.module.public.api" const i18n = "i18n.module.public.api" const virtualization = "framework-virtualization" const location = "framework-location" +const platformCrashrecovery = "framework-platformcrashrecovery" +const ondeviceintelligence = "framework-ondeviceintelligence-platform" var core_libraries_modules = []string{art, conscrypt, i18n} @@ -39,7 +41,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, ondeviceintelligence} // 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": { |