Snap for 11390602 from 7fe8448082e2175b61a231d6182da8055616e35f to mainline-wifi-release
Change-Id: Iccfa7b7f077d262de1cf4f6e95da8d579a61af83
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 3fb9c11..c092144 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -54,6 +54,7 @@
android.hardware.graphics.mapper@3.0(minSdkVersion:29)
android.hardware.graphics.mapper@4.0(minSdkVersion:29)
android.hardware.media.bufferpool2-V1-ndk(minSdkVersion:29)
+android.hardware.media.bufferpool2-V2-ndk(minSdkVersion:29)
android.hardware.media.bufferpool@2.0(minSdkVersion:29)
android.hardware.media.c2-V1-ndk(minSdkVersion:30)
android.hardware.media.c2@1.0(minSdkVersion:29)
@@ -131,6 +132,7 @@
androidx-constraintlayout_constraintlayout-core(minSdkVersion:24)
androidx-constraintlayout_constraintlayout-solver(minSdkVersion:24)
androidx.activity_activity(minSdkVersion:19)
+androidx.activity_activity-compose(minSdkVersion:21)
androidx.activity_activity-ktx(minSdkVersion:19)
androidx.annotation_annotation(minSdkVersion:24)
androidx.annotation_annotation-experimental(minSdkVersion:19)
@@ -147,6 +149,21 @@
androidx.collection_collection(minSdkVersion:24)
androidx.collection_collection-jvm(minSdkVersion:24)
androidx.collection_collection-ktx(minSdkVersion:24)
+androidx.compose.animation_animation(minSdkVersion:21)
+androidx.compose.animation_animation-core(minSdkVersion:21)
+androidx.compose.foundation_foundation(minSdkVersion:21)
+androidx.compose.foundation_foundation-layout(minSdkVersion:21)
+androidx.compose.material3_material3(minSdkVersion:21)
+androidx.compose.material_material-icons-core(minSdkVersion:21)
+androidx.compose.material_material-ripple(minSdkVersion:21)
+androidx.compose.runtime_runtime(minSdkVersion:21)
+androidx.compose.runtime_runtime-saveable(minSdkVersion:21)
+androidx.compose.ui_ui(minSdkVersion:21)
+androidx.compose.ui_ui-geometry(minSdkVersion:21)
+androidx.compose.ui_ui-graphics(minSdkVersion:21)
+androidx.compose.ui_ui-text(minSdkVersion:21)
+androidx.compose.ui_ui-unit(minSdkVersion:21)
+androidx.compose.ui_ui-util(minSdkVersion:21)
androidx.concurrent_concurrent-futures(minSdkVersion:24)
androidx.constraintlayout_constraintlayout-core(minSdkVersion:24)
androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:19)
@@ -183,6 +200,7 @@
androidx.lifecycle_lifecycle-livedata-core-ktx(minSdkVersion:19)
androidx.lifecycle_lifecycle-process(minSdkVersion:19)
androidx.lifecycle_lifecycle-runtime(minSdkVersion:19)
+androidx.lifecycle_lifecycle-runtime-compose(minSdkVersion:21)
androidx.lifecycle_lifecycle-runtime-ktx(minSdkVersion:19)
androidx.lifecycle_lifecycle-service(minSdkVersion:19)
androidx.lifecycle_lifecycle-viewmodel(minSdkVersion:19)
@@ -266,6 +284,7 @@
codecs_g711dec(minSdkVersion:29)
com.android.vcard(minSdkVersion:9)
com.google.android.material_material(minSdkVersion:19)
+com.uwb.support.aliro(minSdkVersion:30)
com.uwb.support.base(minSdkVersion:30)
com.uwb.support.ccc(minSdkVersion:30)
com.uwb.support.dltdoa(minSdkVersion:30)
@@ -868,6 +887,7 @@
libxml2(minSdkVersion:apex_inherit)
libyuv(minSdkVersion:29)
libyuv_static(minSdkVersion:29)
+libz_static(minSdkVersion:apex_inherit)
libzeroize(minSdkVersion:Tiramisu)
libziparchive(minSdkVersion:apex_inherit)
libzstd(minSdkVersion:(no version))
@@ -1034,12 +1054,15 @@
philox_random(minSdkVersion:30)
philox_random_headers(minSdkVersion:(no version))
philox_random_headers(minSdkVersion:30)
+PhotopickerGoogle(minSdkVersion:30)
+PhotopickerLib(minSdkVersion:30)
PlatformProperties(minSdkVersion:current)
prebuilt_androidx-constraintlayout_constraintlayout-core-nodeps(minSdkVersion:29)
prebuilt_androidx-constraintlayout_constraintlayout-nodeps(minSdkVersion:(no version))
prebuilt_androidx-constraintlayout_constraintlayout-nodeps(minSdkVersion:19)
prebuilt_androidx-constraintlayout_constraintlayout-solver-nodeps(minSdkVersion:24)
prebuilt_androidx-constraintlayout_constraintlayout-solver-nodeps(minSdkVersion:current)
+prebuilt_androidx.activity_activity-compose-nodeps(minSdkVersion:21)
prebuilt_androidx.activity_activity-ktx-nodeps(minSdkVersion:(no version))
prebuilt_androidx.activity_activity-ktx-nodeps(minSdkVersion:19)
prebuilt_androidx.activity_activity-nodeps(minSdkVersion:(no version))
@@ -1074,6 +1097,21 @@
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:24)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:30)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:current)
+prebuilt_androidx.compose.animation_animation-core-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.animation_animation-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.foundation_foundation-layout-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.foundation_foundation-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material3_material3-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material_material-icons-core-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.material_material-ripple-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.runtime_runtime-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.runtime_runtime-saveable-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-geometry-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-graphics-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-text-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-unit-nodeps(minSdkVersion:21)
+prebuilt_androidx.compose.ui_ui-util-nodeps(minSdkVersion:21)
prebuilt_androidx.concurrent_concurrent-futures-nodeps(minSdkVersion:24)
prebuilt_androidx.constraintlayout_constraintlayout-core-nodeps(minSdkVersion:24)
prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:(no version))
@@ -1131,6 +1169,7 @@
prebuilt_androidx.lifecycle_lifecycle-livedata-nodeps(minSdkVersion:19)
prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:(no version))
prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:19)
+prebuilt_androidx.lifecycle_lifecycle-runtime-compose-nodeps(minSdkVersion:21)
prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:(no version))
prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:19)
prebuilt_androidx.lifecycle_lifecycle-runtime-nodeps(minSdkVersion:(no version))
diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index 08b30cb..86c6dcf 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -1006,11 +1006,13 @@
apex="com.android.adservices",
sdks=["adservices-module-sdk"],
first_release=Tiramisu,
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.appsearch",
sdks=["appsearch-sdk"],
first_release=Tiramisu,
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.art",
@@ -1037,6 +1039,7 @@
apex="com.android.configinfrastructure",
sdks=["configinfrastructure-sdk"],
first_release=UpsideDownCake,
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.conscrypt",
@@ -1050,11 +1053,13 @@
# Conscrypt was updatable in R but the generate_ml_bundle.sh does not
# appear to generate a snapshot for it.
for_r_build=None,
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.healthfitness",
sdks=["healthfitness-module-sdk"],
first_release=UpsideDownCake,
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.ipsec",
@@ -1066,6 +1071,7 @@
shared_library=True,
),
]),
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.media",
@@ -1074,6 +1080,7 @@
for_r_build=ForRBuild(sdk_libraries=[
SdkLibrary(name="framework-media"),
]),
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.mediaprovider",
@@ -1091,6 +1098,7 @@
apex="com.android.ondevicepersonalization",
sdks=["ondevicepersonalization-module-sdk"],
first_release=Tiramisu,
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.permission",
@@ -1119,6 +1127,7 @@
apex="com.android.scheduling",
sdks=["scheduling-sdk"],
first_release=S,
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.sdkext",
@@ -1127,6 +1136,7 @@
for_r_build=ForRBuild(sdk_libraries=[
SdkLibrary(name="framework-sdkextensions"),
]),
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.os.statsd",
@@ -1135,6 +1145,7 @@
for_r_build=ForRBuild(sdk_libraries=[
SdkLibrary(name="framework-statsd"),
]),
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.tethering",
@@ -1143,6 +1154,7 @@
for_r_build=ForRBuild(sdk_libraries=[
SdkLibrary(name="framework-tethering"),
]),
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.uwb",
diff --git a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
index d705ecb..bc4c54c 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
@@ -4,8 +4,8 @@
soong_config_module_type {
name: "ipsec_prebuilt_java_sdk_library_import",
module_type: "java_sdk_library_import",
- config_namespace: "ANDROID",
- bool_variables: ["module_build_from_source"],
+ config_namespace: "ipsec_module",
+ bool_variables: ["source_build"],
properties: ["prefer"],
}
@@ -13,8 +13,8 @@
soong_config_module_type {
name: "ipsec_prebuilt_prebuilt_bootclasspath_fragment",
module_type: "prebuilt_bootclasspath_fragment",
- config_namespace: "ANDROID",
- bool_variables: ["module_build_from_source"],
+ config_namespace: "ipsec_module",
+ bool_variables: ["source_build"],
properties: ["prefer"],
}
@@ -26,10 +26,10 @@
ipsec_prebuilt_prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-bootclasspath-fragment",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
prefer: true,
soong_config_variables: {
- module_build_from_source: {
+ source_build: {
prefer: false,
},
},
@@ -48,10 +48,10 @@
ipsec_prebuilt_java_sdk_library_import {
name: "android.net.ipsec.ike",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
prefer: true,
soong_config_variables: {
- module_build_from_source: {
+ source_build: {
prefer: false,
},
},
diff --git a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected
index 2b844ab..e8ba1b0 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected
@@ -8,10 +8,10 @@
prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-bootclasspath-fragment",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
use_source_config_var: {
- config_namespace: "ANDROID",
- var_name: "module_build_from_source",
+ config_namespace: "ipsec_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.ipsec"],
@@ -28,10 +28,10 @@
java_sdk_library_import {
name: "android.net.ipsec.ike",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
use_source_config_var: {
- config_namespace: "ANDROID",
- var_name: "module_build_from_source",
+ config_namespace: "ipsec_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
diff --git a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected
index 38025d4..d33b217 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected
@@ -8,10 +8,10 @@
prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-bootclasspath-fragment",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
use_source_config_var: {
- config_namespace: "ANDROID",
- var_name: "module_build_from_source",
+ config_namespace: "ipsec_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.ipsec"],
@@ -28,10 +28,10 @@
java_sdk_library_import {
name: "android.net.ipsec.ike",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true.
use_source_config_var: {
- config_namespace: "ANDROID",
- var_name: "module_build_from_source",
+ config_namespace: "ipsec_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp
index 2ee0d95..a8afbc1 100644
--- a/sdk/ModuleDefaults.bp
+++ b/sdk/ModuleDefaults.bp
@@ -127,15 +127,10 @@
sdk_version: "module_current",
},
- // Disallow disabling the NewApi lint check.
- lint: {
- strict_updatability_linting: true,
- },
-
defaults_visibility: [
":__subpackages__",
// TODO(b/237461653): Move this to packages/modules/Nfc
- "//frameworks/base/core/java",
+ "//frameworks/base/nfc",
"//frameworks/base/apex:__subpackages__",
"//frameworks/base/libs/hwui",
"//frameworks/base/wifi",
@@ -156,11 +151,6 @@
sdk_version: "system_server_current",
},
- // Disallow disabling the NewApi lint check.
- lint: {
- strict_updatability_linting: true,
- },
-
defaults_visibility: [
":__subpackages__",
"//art/libartservice:__subpackages__",
