diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 129 |
1 files changed, 98 insertions, 31 deletions
diff --git a/Android.bp b/Android.bp index a20a5284db23..89a4557fa1ce 100644 --- a/Android.bp +++ b/Android.bp @@ -139,7 +139,7 @@ filegroup { } filegroup { - name: "framework-graphics-sources", + name: "framework-graphics-nonupdatable-sources", srcs: [ "graphics/java/**/*.java", "graphics/java/**/*.aidl", @@ -297,7 +297,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", @@ -348,12 +348,17 @@ filegroup { // etc. ":framework-javastream-protos", ":statslog-framework-java-gen", // FrameworkStatsLog.java + + // telephony annotations + ":framework-telephony-annotations", ], } filegroup { name: "framework-updatable-sources", srcs: [ + ":framework-appsearch-sources", + ":framework-graphics-srcs", ":framework-mediaprovider-sources", ":framework-permission-sources", ":framework-sdkextensions-sources", @@ -367,6 +372,8 @@ filegroup { java_library { name: "framework-updatable-stubs-module_libs_api", static_libs: [ + "framework-appsearch-stubs", // TODO: Update to module_libs_api when there is one. + "framework-graphics.stubs.module_lib", "framework-media.stubs.module_lib", "framework-mediaprovider.stubs.module_lib", "framework-permission.stubs.module_lib", @@ -503,6 +510,7 @@ java_defaults { plugins: [ "view-inspector-annotation-processor", "staledataclass-annotation-processor", + "error_prone_android_framework", ], required: [ @@ -544,6 +552,7 @@ 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", } @@ -565,6 +574,7 @@ 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", + "mediatranscoding_aidl_interface-java", ], // For backwards compatibility. stem: "framework", @@ -572,6 +582,7 @@ java_library { 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", @@ -594,6 +605,8 @@ java_library { static_libs: [ "app-compat-annotations", "framework-minus-apex", + // TODO(b/146218515): should be removed + "framework-appsearch", "framework-updatable-stubs-module_libs_api", ], sdk_version: "core_platform", @@ -608,10 +621,12 @@ java_library { static_libs: [ "exoplayer2-extractor", "android.hardware.wifi-V1.0-java-constants", + "mediatranscoding_aidl_interface-java", // Additional dependencies needed to build the ike API classes. "ike-internals", ], + libs: ["icing-java-proto-lite"], apex_available: ["//apex_available:platform"], visibility: [ // DO NOT ADD ANY MORE ENTRIES TO THIS LIST @@ -622,8 +637,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 @@ -766,6 +781,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", @@ -796,6 +812,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", @@ -807,6 +824,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 { @@ -1175,6 +1213,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", @@ -1197,6 +1236,7 @@ filegroup { filegroup { name: "framework-telephony-shared-srcs", srcs: [ + "core/java/android/util/IndentingPrintWriter.java", "core/java/android/util/RecurrenceRule.java", "core/java/com/android/internal/os/SomeArgs.java", "core/java/com/android/internal/util/BitwiseInputStream.java", @@ -1306,42 +1346,69 @@ build = [ "ApiDocs.bp", ] -java_library { - name: "framework-telephony", +// TODO(b/147699819): move to frameworks/base/telephony/ folder +droidstubs { + name: "framework-telephony-stubs-srcs", srcs: [ - //":framework-telephony-sources", - //":framework-telephony-shared-srcs", + ":framework-telephony-sources", + ":framework_native_aidl", + ":framework-javastream-protos", ], - // TODO: change to framework-system-stub to build against system APIs. + aidl: { + local_include_dirs: [ + "core/java", + "telecomm/java" + ], + }, libs: [ - "framework-minus-apex", - "unsupportedappusage", - ], - static_libs: [ - "libphonenumber-platform", - "app-compat-annotations", + "framework-annotations-lib", + "android.hardware.radio-V1.5-java", ], - sdk_version: "core_platform", + check_api: { + current: { + // TODO(b/147699819): remove telephony prefix when moved + api_file: "telephony/api/system-current.txt", + removed_api_file: "telephony/api/system-removed.txt", + }, + }, + // TODO: make telephony inherit the shared stubs and remove this + args: "--show-annotation android.annotation.SystemApi\\(" + + "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + + "\\) " + + "--error UnhiddenSystemApi " + + "--hide BroadcastBehavior " + + "--hide DeprecationMismatch " + + "--hide HiddenSuperclass " + + "--hide HiddenTypedefConstant " + + "--hide HiddenTypeParameter " + + "--hide MissingPermission " + + "--hide RequiresPermission " + + "--hide SdkConstant " + + "--hide Todo " + + "--hide Typo " + + "--hide UnavailableSymbol ", + filter_packages: ["android.telephony"], + sdk_version: "system_current", +} + +java_library { + name: "framework-telephony-stubs", + srcs: [":framework-telephony-stubs-srcs"], + // TODO(b/147699819): move public aidls to a separate folder and potentially remove + // below aidl exports. aidl: { export_include_dirs: ["telephony/java"], - include_dirs: [ - "frameworks/native/aidl/binder", - "frameworks/native/aidl/gui", - ] }, - jarjar_rules: ":framework-telephony-jarjar-rules", - dxflags: [ - "--core-library", - "--multi-dex", - ], - // This is to break the dependency from boot jars. - dex_preopt: { - enabled: false, - }, - installable: true, + sdk_version: "module_current", +} + +filegroup { + // TODO (b/147690217): move to frameworks/base/telephony/common. + name: "framework-telephony-annotations", + srcs: ["telephony/java/android/telephony/Annotation.java"], } filegroup { name: "framework-telephony-jarjar-rules", srcs: ["telephony/framework-telephony-jarjar-rules.txt"], -}
\ No newline at end of file +} |