diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp index 3af2f07884e5..36ed8656cfbc 100644 --- a/Android.bp +++ b/Android.bp @@ -69,6 +69,7 @@ filegroup { // Java/AIDL sources under frameworks/base ":framework-annotations", ":framework-blobstore-sources", + ":framework-connectivity-tiramisu-sources", ":framework-core-sources", ":framework-drm-sources", ":framework-graphics-nonupdatable-sources", @@ -82,6 +83,7 @@ filegroup { ":framework-mca-filterpacks-sources", ":framework-media-sources", ":framework-mms-sources", + ":framework-omapi-sources", ":framework-opengl-sources", ":framework-rs-sources", ":framework-sax-sources", @@ -122,7 +124,6 @@ filegroup { ":libbluetooth-binder-aidl", ":libcamera_client_aidl", ":libcamera_client_framework_aidl", - ":packagemanager_aidl", ":libupdate_engine_aidl", ":resourcemanager_aidl", ":storaged_aidl", @@ -224,6 +225,7 @@ java_library { name: "framework-internal-utils", static_libs: [ "apex_aidl_interface-java", + "packagemanager_aidl-java", "framework-protos", "updatable-driver-protos", "ota_metadata_proto_java", @@ -244,6 +246,12 @@ java_library { "android.hardware.radio-V1.4-java", "android.hardware.radio-V1.5-java", "android.hardware.radio-V1.6-java", + "android.hardware.radio.data-V1-java", + "android.hardware.radio.messaging-V1-java", + "android.hardware.radio.modem-V1-java", + "android.hardware.radio.network-V1-java", + "android.hardware.radio.sim-V1-java", + "android.hardware.radio.voice-V1-java", "android.hardware.thermal-V1.0-java-constants", "android.hardware.thermal-V1.0-java", "android.hardware.thermal-V1.1-java", @@ -262,6 +270,7 @@ java_library { "android.hardware.vibrator-V1.2-java", "android.hardware.vibrator-V1.3-java", "android.hardware.vibrator-V2-java", + "android.se.omapi-V1-java", "android.system.suspend.control.internal-java", "devicepolicyprotosnano", @@ -288,6 +297,7 @@ java_defaults { srcs: [ ":framework-non-updatable-sources", "core/java/**/*.logtags", + ":apex-info-list", ], aidl: { generate_get_transaction_name: true, @@ -318,8 +328,10 @@ java_defaults { "icu4j-platform-compat-config", "protolog.conf.json.gz", "services-platform-compat-config", + "TeleService-platform-compat-config", "documents-ui-compat-config", "calendar-provider-compat-config", + "contacts-provider-platform-compat-config", ], libs: [ "app-compat-annotations", @@ -338,6 +350,7 @@ java_defaults { "tv_tuner_resource_manager_aidl_interface-java", "soundtrigger_middleware-aidl-java", "modules-utils-preconditions", + "modules-utils-synchronous-result-receiver", "modules-utils-os", "framework-permission-aidl-java", ], @@ -408,9 +421,7 @@ filegroup { srcs: [ "core/java/android/net/annotations/PolicyDirection.java", "core/java/com/android/internal/util/HexDump.java", - "core/java/com/android/internal/util/IState.java", - "core/java/com/android/internal/util/State.java", - "core/java/com/android/internal/util/StateMachine.java", + "core/java/com/android/internal/util/WakeupMessage.java", "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java", "telephony/java/android/telephony/Annotation.java", ], @@ -427,11 +438,8 @@ filegroup { "core/java/android/util/LocalLog.java", "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/IndentingPrintWriter.java", - "core/java/com/android/internal/util/IState.java", "core/java/com/android/internal/util/MessageUtils.java", "core/java/com/android/internal/util/RingBufferIndices.java", - "core/java/com/android/internal/util/State.java", - "core/java/com/android/internal/util/StateMachine.java", "core/java/com/android/internal/util/WakeupMessage.java", "core/java/com/android/internal/util/TokenBucket.java", ], @@ -458,8 +466,6 @@ java_library { sdk_version: "module_current", min_sdk_version: "30", srcs: [ - ":modules-utils-preconditions-srcs", - "core/java/android/os/HandlerExecutor.java", "core/java/com/android/internal/util/AsyncChannel.java", "core/java/com/android/internal/util/AsyncService.java", "core/java/com/android/internal/util/Protocol.java", @@ -562,6 +568,7 @@ stubs_defaults { "android.hardware.vibrator-V1.3-java", "framework-protos", "art.module.public.api", + "sdk_module-lib_current_framework-tethering", // There are a few classes from modules used by the core that // need to be resolved by metalava. We use a prebuilt stub of the // full sdk to ensure we can resolve them. If a new class gets added, |