diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 137 |
1 files changed, 46 insertions, 91 deletions
diff --git a/Android.bp b/Android.bp index 1c16e466703c..b3dc98b2fa06 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 @@ -349,9 +380,6 @@ filegroup { // etc. ":framework-javastream-protos", ":statslog-framework-java-gen", // FrameworkStatsLog.java - - // telephony annotations - ":framework-telephony-annotations", ], } @@ -540,8 +568,8 @@ filegroup { 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", @@ -557,7 +585,6 @@ java_library { "--core-library", "--multi-dex", ], - installable: true, jarjar_rules: ":framework-jarjar-rules", javac_shard_size: 150, plugins: [ @@ -590,6 +617,12 @@ java_library { "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"], @@ -610,6 +643,12 @@ java_library { }, } +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 // "framework-minus-apex" that gets installed to the device. Note that // the filename is still framework.jar (via the stem property) for @@ -1228,23 +1267,6 @@ filegroup { } // Avoid including Parcelable classes as we don't want to have two copies of -// Parcelable cross the process. This is used by framework-telephony (frameworks/base/telephony). -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", - "core/java/com/android/internal/util/BitwiseOutputStream.java", - "core/java/com/android/internal/util/FunctionalUtils.java", - "core/java/com/android/internal/util/HexDump.java", - "core/java/com/android/internal/util/IndentingPrintWriter.java", - "core/java/com/android/internal/util/Preconditions.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", @@ -1272,7 +1294,7 @@ filegroup { // into wifi-service java_library { name: "framework-wifi-util-lib", - sdk_version: "module_current", + sdk_version: "module_30", srcs: [ "core/java/android/content/pm/BaseParceledListSlice.java", "core/java/android/content/pm/ParceledListSlice.java", @@ -1341,73 +1363,6 @@ build = [ "ApiDocs.bp", ] -// TODO(b/147699819): move to frameworks/base/telephony/ folder -droidstubs { - name: "framework-telephony-stubs-srcs", - srcs: [ - ":framework-telephony-sources", - ":framework_native_aidl", - ":framework-javastream-protos", - ], - aidl: { - local_include_dirs: [ - "core/java", - "telecomm/java" - ], - }, - libs: [ - "framework-annotations-lib", - "android.hardware.radio-V1.6-java", - ], - 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"], - }, - 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"], -} - // protolog start filegroup { name: "protolog-common-src", |