diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 146 |
1 files changed, 139 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index eb1718efbef6..6b39b514a2df 100644 --- a/Android.bp +++ b/Android.bp @@ -14,6 +14,37 @@ // Build the master framework library. +// Defaults for platform code that runs inside system_server +java_defaults { + name: "platform_service_defaults", + plugins: [ + "error_prone_android_framework", + ], + errorprone: { + javacflags: [ + "-Xep:AndroidFrameworkBinderIdentity:ERROR", + "-Xep:AndroidFrameworkCompatChange:ERROR", + "-Xep:AndroidFrameworkUid:ERROR", + ], + }, +} + +// Defaults for platform apps +java_defaults { + name: "platform_app_defaults", + plugins: [ + "error_prone_android_framework", + ], + errorprone: { + javacflags: [ + // We're less worried about performance in app code + "-Xep:AndroidFrameworkEfficientCollections:OFF", + "-Xep:AndroidFrameworkEfficientParcelable:OFF", + "-Xep:AndroidFrameworkEfficientStrings:OFF", + ], + }, +} + // READ ME: ######################################################## // // When updating this list of aidl files, consider if that aidl is @@ -139,7 +170,7 @@ filegroup { } filegroup { - name: "framework-graphics-sources", + name: "framework-graphics-nonupdatable-sources", srcs: [ "graphics/java/**/*.java", "graphics/java/**/*.aidl", @@ -297,7 +328,7 @@ filegroup { ":framework-blobstore-sources", ":framework-core-sources", ":framework-drm-sources", - ":framework-graphics-sources", + ":framework-graphics-nonupdatable-sources", ":framework-jobscheduler-sources", // jobscheduler is not a module for R ":framework-keystore-sources", ":framework-identity-sources", @@ -330,6 +361,7 @@ filegroup { ":gatekeeper_aidl", ":gsiservice_aidl", ":incidentcompanion_aidl", + ":inputconstants_aidl", ":installd_aidl", ":keystore_aidl", ":libaudioclient_aidl", @@ -354,6 +386,8 @@ filegroup { filegroup { name: "framework-updatable-sources", srcs: [ + ":framework-appsearch-sources", + ":framework-graphics-srcs", ":framework-mediaprovider-sources", ":framework-permission-sources", ":framework-sdkextensions-sources", @@ -368,6 +402,8 @@ filegroup { java_library { name: "framework-updatable-stubs-module_libs_api", static_libs: [ + "framework-appsearch.stubs.module_lib", + "framework-graphics.stubs.module_lib", "framework-media.stubs.module_lib", "framework-mediaprovider.stubs.module_lib", "framework-permission.stubs.module_lib", @@ -385,6 +421,8 @@ java_library { installable: false, static_libs: [ "framework-minus-apex", + "framework-appsearch.impl", + "framework-graphics.impl", "framework-mediaprovider.impl", "framework-permission.impl", "framework-sdkextensions.impl", @@ -455,6 +493,7 @@ java_library { "android.hardware.cas-V1.2-java", "android.hardware.contexthub-V1.0-java", "android.hardware.contexthub-V1.1-java", + "android.hardware.contexthub-V1.2-java", "android.hardware.gnss-V1.0-java", "android.hardware.gnss-V2.1-java", "android.hardware.health-V1.0-java-constants", @@ -471,6 +510,7 @@ java_library { "android.hardware.thermal-V2.0-java", "android.hardware.tv.input-V1.0-java-constants", "android.hardware.tv.tuner-V1.0-java-constants", + "android.hardware.tv.tuner-V1.1-java-constants", "android.hardware.usb-V1.0-java-constants", "android.hardware.usb-V1.1-java-constants", "android.hardware.usb-V1.2-java-constants", @@ -524,12 +564,13 @@ filegroup { "core/java/android/os/IThermalEventListener.aidl", "core/java/android/os/IThermalStatusListener.aidl", "core/java/android/os/IThermalService.aidl", + "core/java/android/os/IPowerManager.aidl", ], path: "core/java", } -java_library { - name: "framework-minus-apex", +java_defaults { + name: "framework-minus-apex-defaults", defaults: ["framework-aidl-export-defaults"], srcs: [ ":framework-non-updatable-sources", @@ -539,17 +580,19 @@ java_library { exclude_srcs: ["core/java/android/content/pm/AndroidTestBaseUpdater.java"], aidl: { generate_get_transaction_name: true, + local_include_dirs: ["media/aidl"], + include_dirs: ["frameworks/av/aidl"], }, dxflags: [ "--core-library", "--multi-dex", ], - installable: true, jarjar_rules: ":framework-jarjar-rules", javac_shard_size: 150, plugins: [ "view-inspector-annotation-processor", "staledataclass-annotation-processor", + "error_prone_android_framework", ], required: [ "framework-platform-compat-config", @@ -560,6 +603,7 @@ java_library { "protolog.conf.json.gz", "services-platform-compat-config", "documents-ui-compat-config", + "calendar-provider-compat-config", ], libs: [ "app-compat-annotations", @@ -573,18 +617,41 @@ java_library { // 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", + "av-types-aidl-java", + "mediatranscoding_aidl_interface-java", + "soundtrigger_middleware-aidl-java", ], +} + +java_library { + name: "framework-minus-apex", + defaults: ["framework-minus-apex-defaults"], + installable: true, // For backwards compatibility. stem: "framework", apex_available: ["//apex_available:platform"], visibility: [ "//frameworks/base", // TODO(b/147128803) remove the below lines + "//frameworks/base/apex/appsearch/framework", "//frameworks/base/apex/blobstore/framework", "//frameworks/base/apex/jobscheduler/framework", "//frameworks/base/packages/Tethering/tests/unit", "//packages/modules/Connectivity/Tethering/tests/unit", ], + errorprone: { + javacflags: [ + "-Xep:AndroidFrameworkBinderIdentity:ERROR", + "-Xep:AndroidFrameworkCompatChange:ERROR", + "-Xep:AndroidFrameworkUid:ERROR", + ], + }, +} + +java_library { + name: "framework-minus-apex-intdefs", + defaults: ["framework-minus-apex-defaults"], + plugins: ["intdef-annotation-processor"], } // This "framework" module is NOT installed to the device. It's @@ -603,6 +670,7 @@ java_library { static_libs: [ "app-compat-annotations", "framework-minus-apex", + "framework-appsearch.impl", // TODO(b/146218515): should be removed "framework-updatable-stubs-module_libs_api", ], sdk_version: "core_platform", @@ -610,8 +678,8 @@ java_library { } platform_compat_config { - name: "framework-platform-compat-config", - src: ":framework-minus-apex", + name: "framework-platform-compat-config", + src: ":framework-minus-apex", } // A temporary build target that is conditionally included on the bootclasspath if @@ -718,6 +786,7 @@ filegroup { "core/java/android/annotation/RequiresPermission.java", "core/java/android/annotation/SdkConstant.java", "core/java/android/annotation/StringDef.java", + "core/java/android/annotation/SuppressLint.java", "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/SystemService.java", "core/java/android/annotation/TestApi.java", @@ -754,6 +823,7 @@ filegroup { // TODO: remove these annotations as soon as we can use andoid.support.annotations.* ":framework-annotations", "core/java/android/net/DhcpResults.java", + "core/java/android/util/IndentingPrintWriter.java", "core/java/android/util/LocalLog.java", "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/IndentingPrintWriter.java", @@ -781,6 +851,7 @@ filegroup { filegroup { name: "framework-tethering-shared-srcs", srcs: [ + "core/java/android/util/IndentingPrintWriter.java", "core/java/android/util/LocalLog.java", "core/java/com/android/internal/util/IndentingPrintWriter.java", "core/java/com/android/internal/util/IState.java", @@ -791,6 +862,27 @@ filegroup { ], } +// keep these files in sync with the apex/jobscheduler/service jarjar-rules.txt for +// the jobscheduler module. +filegroup { + name: "framework-jobscheduler-shared-srcs", + srcs: [ + "core/java/com/android/internal/util/ArrayUtils.java", + "core/java/com/android/internal/util/BitUtils.java", + "core/java/com/android/internal/util/CollectionUtils.java", + "core/java/com/android/internal/util/ConcurrentUtils.java", + "core/java/com/android/internal/util/DumpUtils.java", + "core/java/com/android/internal/util/FastPrintWriter.java", + "core/java/com/android/internal/util/FastXmlSerializer.java", + "core/java/com/android/internal/util/FunctionalUtils.java", + "core/java/com/android/internal/util/ParseUtils.java", + "core/java/com/android/internal/util/Preconditions.java", + "core/java/com/android/internal/util/RingBufferIndices.java", + "core/java/com/android/internal/util/StatLogger.java", + "core/java/com/android/internal/util/XmlUtils.java", + ], +} + // Build ext.jar // ============================================================ java_library { @@ -835,6 +927,7 @@ java_library { exclude_srcs: [ "core/proto/android/privacy.proto", "core/proto/android/section.proto", + "core/proto/android/typedef.proto", ], sdk_version: "9", srcs: [ @@ -860,6 +953,7 @@ java_library { exclude_srcs: [ "core/proto/android/privacy.proto", "core/proto/android/section.proto", + "core/proto/android/typedef.proto", ], sdk_version: "core_current", // Protos have lots of MissingOverride and similar. @@ -991,6 +1085,7 @@ filegroup { name: "incremental_manager_aidl", srcs: [ "core/java/android/os/incremental/IIncrementalService.aidl", + "core/java/android/os/incremental/IStorageLoadingProgressListener.aidl", "core/java/android/os/incremental/IncrementalNewFileParams.aidl", "core/java/android/os/incremental/IStorageHealthListener.aidl", "core/java/android/os/incremental/StorageHealthCheckParams.aidl", @@ -998,6 +1093,14 @@ filegroup { path: "core/java", } +filegroup { + name: "activity_manager_procstate_aidl", + srcs: [ + "core/java/android/app/ProcessStateEnum.aidl", + ], + path: "core/java", +} + aidl_interface { name: "libincremental_aidl", unstable: true, @@ -1159,6 +1262,7 @@ filegroup { "core/java/android/os/BasicShellCommandHandler.java", "core/java/android/os/RegistrantList.java", "core/java/android/os/Registrant.java", + "core/java/android/util/IndentingPrintWriter.java", "core/java/android/util/LocalLog.java", "core/java/android/util/TimeUtils.java", "core/java/com/android/internal/os/SomeArgs.java", @@ -1205,6 +1309,7 @@ filegroup { java_library { name: "framework-wifi-util-lib", sdk_version: "module_current", + min_sdk_version: "30", srcs: [ "core/java/android/content/pm/BaseParceledListSlice.java", "core/java/android/content/pm/ParceledListSlice.java", @@ -1272,3 +1377,30 @@ build = [ "StubLibraries.bp", "ApiDocs.bp", ] + +// protolog start +filegroup { + name: "protolog-common-src", + srcs: [ + "core/java/com/android/internal/protolog/common/**/*.java", + ], +} + +java_library { + name: "protolog-lib", + platform_apis: true, + srcs: [ + "core/java/com/android/internal/protolog/ProtoLogImpl.java", + "core/java/com/android/internal/protolog/ProtoLogViewerConfigReader.java", + ":protolog-common-src", + ], +} + +java_library { + name: "protolog-groups", + srcs: [ + "core/java/com/android/internal/protolog/ProtoLogGroup.java", + ":protolog-common-src", + ], +} +// protolog end |