diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 64 |
1 files changed, 53 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp index 303cff999c1f..9426a9c503ed 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", ], } @@ -319,12 +327,14 @@ java_library { "android.hardware.cas-V1.1-java", "android.hardware.cas-V1.0-java", "android.hardware.contexthub-V1.0-java", + "android.hardware.gnss-V1.0-java", "android.hardware.health-V1.0-java-constants", "android.hardware.radio-V1.0-java", "android.hardware.radio-V1.1-java", "android.hardware.radio-V1.2-java", "android.hardware.radio-V1.3-java", "android.hardware.radio-V1.4-java", + "android.hardware.radio-V1.5-java", "android.hardware.thermal-V1.0-java-constants", "android.hardware.thermal-V1.0-java", "android.hardware.thermal-V1.1-java", @@ -375,7 +385,6 @@ java_defaults { static_libs: [ "framework-internal-utils", - "mimemap", ], dxflags: [ @@ -437,6 +446,12 @@ java_library { "services-platform-compat-config", "media-provider-platform-compat-config", "services-devicepolicy-platform-compat-config", + "services-core-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 +587,12 @@ filegroup { ], } +java_library { + name: "framework-annotations-lib", + srcs: [ ":framework-annotations" ], + sdk_version: "current", +} + filegroup { name: "framework-networkstack-shared-srcs", srcs: [ @@ -772,7 +793,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", @@ -782,10 +803,9 @@ filegroup { } filegroup { - name: "incremental_data_loader_aidl", + name: "dataloader_aidl", srcs: [ - "core/java/android/service/incremental/IIncrementalDataLoaderStatusListener.aidl", - "core/java/android/service/incremental/IIncrementalDataLoaderService.aidl", + "core/java/android/content/pm/IDataLoaderStatusListener.aidl", ], path: "core/java", } @@ -794,7 +814,27 @@ aidl_interface { name: "libincremental_aidl", srcs: [ ":incremental_aidl", - ":incremental_data_loader_aidl", + ], + imports: [ + "libdataloader_aidl", + ], + backend: { + java: { + sdk_version: "28", + }, + cpp: { + enabled: true, + }, + ndk: { + enabled: true, + }, + }, +} + +aidl_interface { + name: "libdataloader_aidl", + srcs: [ + ":dataloader_aidl", ], backend: { java: { @@ -1015,14 +1055,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", ], @@ -1080,12 +1121,12 @@ 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"], @@ -1615,12 +1656,12 @@ filegroup { "core/java/com/android/internal/os/SomeArgs.java", "core/java/com/android/internal/util/FastXmlSerializer.java", "core/java/com/android/internal/util/HexDump.java", + "core/java/com/android/internal/util/IState.java", "core/java/com/android/internal/util/IndentingPrintWriter.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/UserIcons.java", - "core/java/com/android/internal/util/XmlUtils.java", ], } @@ -1653,6 +1694,7 @@ filegroup { srcs: [ ":framework-annotations", "core/java/android/os/HandlerExecutor.java", + "core/java/android/util/BackupUtils.java", "core/java/android/util/KeyValueListParser.java", "core/java/android/util/LocalLog.java", "core/java/android/util/Rational.java", |