diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp index a082085f6804..c1f6860980de 100644 --- a/Android.bp +++ b/Android.bp @@ -225,7 +225,6 @@ filegroup { ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", ":framework-media-sources", - ":framework-mime-sources", ":framework-mms-sources", ":framework-opengl-sources", ":framework-rs-sources", @@ -267,10 +266,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", ], } @@ -375,7 +383,6 @@ java_defaults { static_libs: [ "framework-internal-utils", - "mimemap", ], dxflags: [ @@ -438,6 +445,11 @@ java_library { "media-provider-platform-compat-config", "services-devicepolicy-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", } @@ -572,6 +584,12 @@ filegroup { ], } +java_library { + name: "framework-annotations-lib", + srcs: [ ":framework-annotations" ], + sdk_version: "current", +} + filegroup { name: "framework-networkstack-shared-srcs", srcs: [ @@ -772,7 +790,7 @@ cc_library { filegroup { name: "incremental_aidl", srcs: [ - "core/java/android/os/incremental/IIncrementalService.aidl", + "core/java/android/os/incremental/IIncrementalManager.aidl", "core/java/android/os/incremental/IIncrementalServiceProxy.aidl", "core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl", "core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl", @@ -1015,14 +1033,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", ], @@ -1034,7 +1053,7 @@ stubs_defaults { "sdk-dir", "api-versions-jars-dir", ], - previous_api: ":last-released-public-api-for-metalava-annotations", + previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", ], @@ -1080,18 +1099,18 @@ 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, annotations_enabled: true, - previous_api: ":last-released-public-api-for-metalava-annotations", + previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", ], @@ -1427,7 +1446,7 @@ droidstubs { installable: false, sdk_version: "core_platform", annotations_enabled: true, - previous_api: ":last-released-public-api-for-metalava-annotations", + previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", ], @@ -1611,11 +1630,8 @@ filegroup { "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/ArrayUtils.java", - "core/java/com/android/internal/util/DumpUtils.java", "core/java/com/android/internal/util/FastXmlSerializer.java", "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/IndentingPrintWriter.java", @@ -1623,7 +1639,6 @@ filegroup { "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", "core/java/com/android/internal/util/UserIcons.java", - "core/java/com/android/internal/util/XmlUtils.java", ], } @@ -1632,8 +1647,10 @@ filegroup { filegroup { name: "framework-cellbroadcast-shared-srcs", srcs: [ + "core/java/android/os/HandlerExecutor.java", "core/java/android/util/LocalLog.java", - "core/java/android/util/Slog.java", + "core/java/com/android/internal/util/IState.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", ], |