diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp index c89917975e8e..5796fb17046c 100644 --- a/Android.bp +++ b/Android.bp @@ -401,8 +401,8 @@ java_defaults { "app-compat-annotations", "ext", "unsupportedappusage", - "updatable_media_stubs", - "framework_mediaprovider_stubs", + "framework-media-stubs-systemapi", + "framework-mediaprovider-stubs-systemapi", "framework-tethering", "framework-telephony-stubs", ], @@ -469,7 +469,7 @@ java_library { "framework-appsearch-stubs", "framework-sdkextensions-stubs-systemapi", "framework-statsd", // TODO(b/146167933): Use framework-statsd-stubs - "framework-permission-stubs", + "framework-permission-stubs-systemapi", "framework-wifi-stubs", "ike-stubs", ], @@ -491,14 +491,11 @@ java_library { apex_available: ["//apex_available:platform"], visibility: [ "//frameworks/base", - // TODO(b/144149403) remove the below lines + // TODO(b/147128803) remove the below lines "//frameworks/base/apex/appsearch/framework", "//frameworks/base/apex/blobstore/framework", "//frameworks/base/apex/jobscheduler/framework", - "//frameworks/base/apex/permission/framework", "//frameworks/base/apex/statsd/service", - "//frameworks/base/telephony", - "//frameworks/opt/net/wifi/service", ], } @@ -517,10 +514,10 @@ java_library { installable: false, // this lib is a build-only library static_libs: [ "framework-minus-apex", - "updatable_media_stubs", - "framework_mediaprovider_stubs", "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs - "framework-permission-stubs", + "framework-media-stubs-systemapi", + "framework-mediaprovider-stubs-systemapi", + "framework-permission-stubs-systemapi", "framework-sdkextensions-stubs-systemapi", // TODO(b/146167933): Use framework-statsd-stubs instead. "framework-statsd", @@ -945,7 +942,7 @@ filegroup { name: "incremental_manager_aidl", srcs: [ "core/java/android/os/incremental/IIncrementalManager.aidl", - "core/java/android/os/incremental/IIncrementalManagerNative.aidl", + "core/java/android/os/incremental/IIncrementalService.aidl", "core/java/android/os/incremental/IncrementalNewFileParams.aidl", "core/java/android/os/incremental/IncrementalSignature.aidl", ], |