diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index d7b37288934a..f48e6feb1c14 100644 --- a/Android.bp +++ b/Android.bp @@ -401,7 +401,7 @@ java_defaults { "app-compat-annotations", "ext", "unsupportedappusage", - "updatable_media_stubs", + "framework-media-stubs-systemapi", "framework_mediaprovider_stubs", "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", ], @@ -517,10 +517,10 @@ java_library { installable: false, // this lib is a build-only library static_libs: [ "framework-minus-apex", - "updatable_media_stubs", + "framework-media-stubs-systemapi", "framework_mediaprovider_stubs", "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs - "framework-permission-stubs", + "framework-permission-stubs-systemapi", "framework-sdkextensions-stubs-systemapi", // TODO(b/146167933): Use framework-statsd-stubs instead. "framework-statsd", @@ -551,17 +551,25 @@ java_library { java_library { name: "framework-annotation-proc", - srcs: [":framework-all-sources"], + srcs: [ + ":framework-all-sources", + "core/java/**/*.logtags", + ], + sdk_version: "core_platform", libs: [ "app-compat-annotations", + "ext", + "icing-java-proto-lite", "unsupportedappusage", ], + installable: false, plugins: [ "unsupportedappusage-annotation-processor", "compat-changeid-annotation-processor", ], static_libs: [ + "framework-internal-utils", "exoplayer2-extractor", "android.hardware.wifi-V1.0-java-constants", ] @@ -583,7 +591,6 @@ java_library { host_supported: true, srcs: [ "core/java/android/annotation/IntDef.java", - "core/java/android/annotation/UnsupportedAppUsage.java", ], static_libs: [ "art.module.api.annotations", @@ -664,7 +671,6 @@ filegroup { "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/SystemService.java", "core/java/android/annotation/TestApi.java", - "core/java/android/annotation/UnsupportedAppUsage.java", "core/java/com/android/internal/annotations/GuardedBy.java", "core/java/com/android/internal/annotations/VisibleForTesting.java", "core/java/com/android/internal/annotations/Immutable.java", @@ -736,6 +742,7 @@ filegroup { "core/java/android/annotation/RequiresPermission.java", "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/TestApi.java", + "core/java/com/android/internal/annotations/GuardedBy.java", ], } // Build ext.jar @@ -939,6 +946,8 @@ filegroup { srcs: [ "core/java/android/os/incremental/IIncrementalManager.aidl", "core/java/android/os/incremental/IIncrementalManagerNative.aidl", + "core/java/android/os/incremental/IncrementalNewFileParams.aidl", + "core/java/android/os/incremental/IncrementalSignature.aidl", ], path: "core/java", } @@ -1071,7 +1080,6 @@ java_library { "core/java/android/annotation/Nullable.java", "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/TestApi.java", - "core/java/android/annotation/UnsupportedAppUsage.java", "core/java/android/os/HidlMemory.java", "core/java/android/os/HwBinder.java", "core/java/android/os/HwBlob.java", |