diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index 6b55cc9f5ea8..8164d6a477e4 100644 --- a/Android.bp +++ b/Android.bp @@ -22,9 +22,12 @@ java_defaults { ], errorprone: { javacflags: [ - "-Xep:AndroidFrameworkBinderIdentity:ERROR", + // "-Xep:AndroidFrameworkBinderIdentity:ERROR", "-Xep:AndroidFrameworkCompatChange:ERROR", - "-Xep:AndroidFrameworkUid:ERROR", + // "-Xep:AndroidFrameworkUid:ERROR", + // NOTE: only enable to generate local patchfiles + // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster", + // "-XepPatchLocation:/tmp/refaster/", ], }, } @@ -41,6 +44,7 @@ java_defaults { "-Xep:AndroidFrameworkEfficientCollections:OFF", "-Xep:AndroidFrameworkEfficientParcelable:OFF", "-Xep:AndroidFrameworkEfficientStrings:OFF", + "-Xep:AndroidFrameworkEfficientXml:OFF", ], }, } @@ -380,6 +384,7 @@ filegroup { // etc. ":framework-javastream-protos", ":statslog-framework-java-gen", // FrameworkStatsLog.java + ":audio_policy_configuration_V7_0", ], } @@ -485,7 +490,6 @@ java_library { name: "framework-internal-utils", static_libs: [ "apex_aidl_interface-java", - "suspend_control_aidl_interface-java", "framework-protos", "updatable-driver-protos", "android.hidl.base-V1.0-java", @@ -516,10 +520,15 @@ java_library { "android.hardware.usb-V1.1-java-constants", "android.hardware.usb-V1.2-java-constants", "android.hardware.usb.gadget-V1.0-java", + "android.hardware.usb.gadget-V1.1-java", + "android.hardware.usb.gadget-V1.2-java", "android.hardware.vibrator-V1.0-java", "android.hardware.vibrator-V1.1-java", "android.hardware.vibrator-V1.2-java", "android.hardware.vibrator-V1.3-java", + "android.system.keystore2-java", + "android.system.suspend.control.internal-java", + "cameraprotosnano", "devicepolicyprotosnano", "com.android.sysprop.apex", @@ -580,6 +589,7 @@ java_defaults { aidl: { generate_get_transaction_name: true, local_include_dirs: ["media/aidl"], + include_dirs: ["frameworks/av/aidl"], }, dxflags: [ "--core-library", @@ -596,6 +606,7 @@ java_defaults { "framework-platform-compat-config", // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. "gps_debug.conf", + "icu4j-platform-compat-config", "libcore-platform-compat-config", "protolog.conf.json.gz", "services-platform-compat-config", @@ -614,8 +625,10 @@ java_defaults { // 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", + "modules-utils-os", ], } @@ -782,6 +795,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", @@ -808,6 +822,7 @@ filegroup { "core/java/com/android/internal/util/IState.java", "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", + "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java", "telephony/java/android/telephony/Annotation.java", ], } @@ -906,8 +921,9 @@ java_library_host { include_dirs: ["external/protobuf/src"], type: "full", }, + // Protos have lots of MissingOverride and similar. errorprone: { - javacflags: ["-Xep:MissingOverride:OFF"], // b/72714520 + javacflags: ["-XepDisableAllChecks"], }, } @@ -1088,6 +1104,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, @@ -1246,7 +1270,6 @@ aidl_mapping { filegroup { name: "framework-telephony-common-shared-srcs", srcs: [ - "core/java/android/os/BasicShellCommandHandler.java", "core/java/android/os/RegistrantList.java", "core/java/android/os/Registrant.java", "core/java/android/util/IndentingPrintWriter.java", @@ -1295,7 +1318,8 @@ filegroup { // into wifi-service java_library { name: "framework-wifi-util-lib", - sdk_version: "module_30", + sdk_version: "module_current", + min_sdk_version: "30", srcs: [ "core/java/android/content/pm/BaseParceledListSlice.java", "core/java/android/content/pm/ParceledListSlice.java", @@ -1328,7 +1352,6 @@ filegroup { name: "framework-wifi-service-shared-srcs", srcs: [ "core/java/android/net/InterfaceConfiguration.java", - "core/java/android/os/BasicShellCommandHandler.java", "core/java/android/util/BackupUtils.java", "core/java/android/util/Rational.java", "core/java/com/android/internal/util/FastXmlSerializer.java", @@ -1346,6 +1369,7 @@ filegroup { metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " + "--ignore-classes-on-classpath " + "--hide-package com.android.server " + + "--hide-package android.audio.policy.configuration.V7_0 " + "--error UnhiddenSystemApi " + "--hide RequiresPermission " + "--hide CallbackInterface " + |