diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/Android.bp | 5 | ||||
| -rw-r--r-- | api/api.go | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/api/Android.bp b/api/Android.bp index 69d602a34380..89993e751cf0 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -109,6 +109,7 @@ combined_apis { "android.net.ipsec.ike", "art.module.public.api", "conscrypt.module.public.api", + "framework-adservices", "framework-appsearch", "framework-bluetooth", "framework-connectivity", @@ -116,18 +117,22 @@ combined_apis { "framework-graphics", "framework-media", "framework-mediaprovider", + "framework-ondevicepersonalization", "framework-permission", "framework-permission-s", "framework-scheduling", "framework-sdkextensions", "framework-statsd", + "framework-sdksandbox", "framework-tethering", + "framework-uwb", "framework-wifi", "i18n.module.public.api", ], system_server_classpath: [ "service-media-s", "service-permission", + "service-sdksandbox", ], } diff --git a/api/api.go b/api/api.go index 9cd0132e2c6c..9aac879b4eae 100644 --- a/api/api.go +++ b/api/api.go @@ -205,8 +205,6 @@ func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) { func createMergedFrameworkImpl(ctx android.LoadHookContext, modules []string) { // This module is for the "framework-all" module, which should not include the core libraries. modules = removeAll(modules, core_libraries_modules) - // TODO(b/214988855): remove the line below when framework-bluetooth has an impl jar. - modules = remove(modules, "framework-bluetooth") props := libraryProps{} props.Name = proptools.StringPtr("all-framework-module-impl") props.Static_libs = transformArray(modules, "", ".impl") |