diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index 4a07db13f4ce..8bc5d7aa0cd9 100644 --- a/Android.bp +++ b/Android.bp @@ -25,6 +25,18 @@ // // READ ME: ######################################################## +// TODO(b/21090328): Remove filter after we are ready to. +soong_config_module_type { + name: "java_library_with_nonpublic_deps", + module_type: "java_library", + config_namespace: "ANDROID", + bool_variables: ["include_nonpublic_framework_api"], + properties: [ + "static_libs", + "libs", + ], +} + package { default_applicable_licenses: ["frameworks_base_license"], } @@ -65,7 +77,6 @@ filegroup { // Java/AIDL sources under frameworks/base ":framework-annotations", ":framework-blobstore-sources", - ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready ":framework-connectivity-tiramisu-sources", ":framework-core-sources", ":framework-drm-sources", @@ -100,6 +111,7 @@ filegroup { // AIDL sources from external directories ":android.hardware.security.keymint-V1-java-source", ":android.hardware.security.secureclock-V1-java-source", + ":android.hardware.tv.tuner-V1-java-source", ":android.security.apc-java-source", ":android.security.authorization-java-source", ":android.security.legacykeystore-java-source", @@ -123,6 +135,7 @@ filegroup { ":libcamera_client_aidl", ":libcamera_client_framework_aidl", ":libupdate_engine_aidl", + ":logd_aidl", ":resourcemanager_aidl", ":storaged_aidl", ":vold_aidl", @@ -138,7 +151,7 @@ filegroup { ], } -java_library { +java_library_with_nonpublic_deps { name: "framework-all", installable: false, static_libs: [ @@ -154,10 +167,20 @@ java_library { "framework-scheduling.impl", "framework-sdkextensions.impl", "framework-statsd.impl", + "framework-supplementalprocess.impl", "framework-tethering.impl", + "framework-nearby.impl", + "framework-uwb.impl", "framework-wifi.impl", "updatable-media", ], + soong_config_variables: { + include_nonpublic_framework_api: { + static_libs: [ + "framework-supplementalapi.impl", + ], + }, + }, apex_available: ["//apex_available:platform"], sdk_version: "core_platform", visibility: [ @@ -214,6 +237,7 @@ java_library { "android.hardware.contexthub-V1.0-java", "android.hardware.contexthub-V1.1-java", "android.hardware.contexthub-V1.2-java", + "android.hardware.contexthub-V1-java", "android.hardware.gnss-V1.0-java", "android.hardware.gnss-V2.1-java", "android.hardware.health-V1.0-java-constants", @@ -235,8 +259,6 @@ java_library { "android.hardware.thermal-V1.1-java", "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", @@ -274,6 +296,7 @@ java_defaults { defaults: ["framework-aidl-export-defaults"], srcs: [ ":framework-non-updatable-sources", + ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready "core/java/**/*.logtags", ":apex-info-list", ], @@ -300,8 +323,12 @@ java_defaults { "error_prone_android_framework", ], required: [ + // TODO(b/120066492): remove default_television.xml when the build system + // propagates "required" properly. + "default_television.xml", "framework-platform-compat-config", - // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. + // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build + // system propagates "required" properly. "gps_debug.conf", "icu4j-platform-compat-config", "protolog.conf.json.gz", @@ -319,6 +346,9 @@ java_defaults { ], sdk_version: "core_platform", static_libs: [ + "android.hardware.common.fmq-V1-java", + // TODO(b/184162091) + "android.hardware.soundtrigger3-V1-java", "bouncycastle-repackaged-unbundled", "framework-internal-utils", // If MimeMap ever becomes its own APEX, then this dependency would need to be removed @@ -352,6 +382,9 @@ java_library { "//frameworks/base/packages/Tethering/tests/unit", "//packages/modules/Connectivity/Tethering/tests/unit", ], + lint: { + extra_check_modules: ["AndroidFrameworkLintChecker"], + }, errorprone: { javacflags: [ "-Xep:AndroidFrameworkBinderIdentity:ERROR", @@ -538,8 +571,6 @@ stubs_defaults { "android.hardware.thermal-V1.0-java-constants", "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.gadget-V1.0-java", @@ -571,6 +602,7 @@ stubs_defaults { libs: [ "art.module.public.api", "sdk_module-lib_current_framework-tethering", + "sdk_public_current_framework-bluetooth", // 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, |