diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 58 |
1 files changed, 51 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index b8d8bc865077..100f70d0f2dd 100644 --- a/Android.bp +++ b/Android.bp @@ -222,7 +222,6 @@ filegroup { ":framework-mca-effect-sources", ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", - ":framework-mime-sources", ":framework-mms-sources", ":framework-opengl-sources", ":framework-rs-sources", @@ -264,10 +263,19 @@ filegroup { } filegroup { + name: "framework-updatable-sources", + srcs: [ + ":framework-sdkext-sources", + ":updatable-media-srcs", + ] +} + +filegroup { name: "framework-all-sources", srcs: [ + ":framework-mime-sources", ":framework-non-updatable-sources", - ":updatable-media-srcs", + ":framework-updatable-sources", ], } @@ -365,7 +373,6 @@ java_defaults { static_libs: [ "framework-internal-utils", - "mimemap", ], required: [ @@ -426,6 +433,11 @@ java_library { "libcore-platform-compat-config", "services-platform-compat-config", ], + static_libs: [ + // If MimeMap ever becomes its own APEX, then this dependency would need to be removed + // in favor of an API stubs dependency in java_library "framework" below. + "mimemap", + ], // For backwards compatibility. stem: "framework", } @@ -556,6 +568,12 @@ filegroup { ], } +java_library { + name: "framework-annotations-lib", + srcs: [ ":framework-annotations" ], + sdk_version: "current", +} + filegroup { name: "framework-networkstack-shared-srcs", srcs: [ @@ -816,11 +834,13 @@ java_library { srcs: [ "core/java/android/os/HidlSupport.java", "core/java/android/annotation/IntDef.java", + "core/java/android/annotation/IntRange.java", "core/java/android/annotation/NonNull.java", "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", "core/java/android/os/HwParcel.java", @@ -947,7 +967,8 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x "--hide CallbackInterface " + "--hide MissingPermission --hide BroadcastBehavior " + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + - "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + + "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*" packages_to_document = [ "android", @@ -965,14 +986,15 @@ packages_to_document = [ stubs_defaults { name: "framework-doc-stubs-default", srcs: [ + ":framework-mime-sources", ":framework-non-updatable-sources", + ":framework-updatable-sources", "core/java/**/*.logtags", "test-base/src/**/*.java", ":opt-telephony-srcs", ":opt-net-voip-srcs", ":core-current-stubs-source", ":core_public_api_files", - ":updatable-media-srcs", "test-mock/src/**/*.java", "test-runner/src/**/*.java", ], @@ -1030,12 +1052,13 @@ stubs_defaults { name: "metalava-api-stubs-default", srcs: [ ":framework-non-updatable-sources", + ":framework-updatable-sources", "core/java/**/*.logtags", ":opt-telephony-srcs", ":opt-net-voip-srcs", ":core-current-stubs-source", ":core_public_api_files", - ":updatable-media-srcs", + ":ike-api-srcs", ], libs: ["framework-internal-utils"], installable: false, @@ -1358,8 +1381,10 @@ droidstubs { srcs: [ "core/java/android/os/HidlSupport.java", "core/java/android/annotation/IntDef.java", + "core/java/android/annotation/IntRange.java", "core/java/android/annotation/NonNull.java", "core/java/android/annotation/SystemApi.java", + "core/java/android/os/HidlMemory.java", "core/java/android/os/HwBinder.java", "core/java/android/os/HwBlob.java", "core/java/android/os/HwParcel.java", @@ -1550,14 +1575,33 @@ genrule { }, } +filegroup { + name: "framework-cellbroadcast-shared-srcs", + srcs: [ + "core/java/android/util/LocalLog.java", + "core/java/android/util/Slog.java", + "core/java/com/android/internal/util/State.java", + "core/java/com/android/internal/util/StateMachine.java", + ], +} + // Avoid including Parcelable classes as we don't want to have two copies of // Parcelable cross the process. filegroup { - name: "framework-cellbroadcast-shared-srcs", + name: "framework-telephony-stack-shared-srcs", srcs: [ + "core/java/android/os/RegistrantList.java", + "core/java/android/os/Registrant.java", "core/java/android/util/LocalLog.java", "core/java/android/util/Slog.java", + "core/java/android/util/TimeUtils.java", + "core/java/com/android/internal/os/SomeArgs.java", + "core/java/com/android/internal/util/Preconditions.java", "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", + "core/java/com/android/internal/util/XmlUtils.java", + "core/java/com/android/internal/util/HexDump.java", + "core/java/com/android/internal/util/IndentingPrintWriter.java", + "core/java/com/android/internal/util/DumpUtils.java" ], } |