diff --git a/OWNERS b/OWNERS index 460cfa1..8e69b01 100644 --- a/OWNERS +++ b/OWNERS @@ -1,12 +1,18 @@ +# Bug component: 819107 # Mainline modularization team -andreionea@google.com +amhk@google.com +ancr@google.com dariofreni@google.com gurpreetgs@google.com hansson@google.com +harshitmahajan@google.com +hsnali@google.com +kalyssa@google.com +mattcarp@google.com paulduffin@google.com pedroql@google.com robertogil@google.com # Escalations -jham@google.com \ No newline at end of file +jham@google.com diff --git a/PREBUILTS_MODULE_OWNERS b/PREBUILTS_MODULE_OWNERS index 65649aa..064f159 100644 --- a/PREBUILTS_MODULE_OWNERS +++ b/PREBUILTS_MODULE_OWNERS @@ -16,3 +16,7 @@ mattcarp@google.com #{LAST_RESORT_SUGGESTION} ahomer@google.com #{LAST_RESORT_SUGGESTION} robertogil@google.com #{LAST_RESORT_SUGGESTION} paulduffin@google.com #{LAST_RESORT_SUGGESTION} +amhk@google.com #{LAST_RESORT_SUGGESTION} +gurpreetgs@google.com #{LAST_RESORT_SUGGESTION} +hsnali@google.com #{LAST_RESORT_SUGGESTION} +kalyssa@google.com #{LAST_RESORT_SUGGESTION} \ No newline at end of file diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index a32a840..8f6fc7d 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -13,15 +13,18 @@ # See go/apex-allowed-deps-error for more details. # TODO(b/157465465): introduce automated quality signals and remove this list. +aconfig_mediacodec_flags_c_lib(minSdkVersion:30) adbroot_aidl_interface-ndk(minSdkVersion:30) android.hardware.audio.common-V1-ndk(minSdkVersion:31) android.hardware.audio.common-V2-ndk(minSdkVersion:31) +android.hardware.audio.common-V3-ndk(minSdkVersion:31) android.hardware.audio.common@5.0(minSdkVersion:30) android.hardware.bluetooth-V1-ndk(minSdkVersion:33) android.hardware.bluetooth.a2dp@1.0(minSdkVersion:30) android.hardware.bluetooth.audio-V1-ndk(minSdkVersion:31) android.hardware.bluetooth.audio-V2-ndk(minSdkVersion:31) android.hardware.bluetooth.audio-V3-ndk(minSdkVersion:31) +android.hardware.bluetooth.audio-V4-ndk(minSdkVersion:31) android.hardware.bluetooth.audio@2.0(minSdkVersion:30) android.hardware.bluetooth.audio@2.1(minSdkVersion:30) android.hardware.bluetooth@1.0(minSdkVersion:30) @@ -44,6 +47,7 @@ android.hardware.graphics.common-V2-ndk(minSdkVersion:29) android.hardware.graphics.common-V2-ndk_platform(minSdkVersion:29) android.hardware.graphics.common-V3-ndk(minSdkVersion:29) android.hardware.graphics.common-V4-ndk(minSdkVersion:29) +android.hardware.graphics.common-V5-ndk(minSdkVersion:29) android.hardware.graphics.common@1.0(minSdkVersion:29) android.hardware.graphics.common@1.1(minSdkVersion:29) android.hardware.graphics.common@1.2(minSdkVersion:29) @@ -53,6 +57,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.bufferpool@2.0(minSdkVersion:29) +android.hardware.media.c2-V1-ndk(minSdkVersion:30) android.hardware.media.c2@1.0(minSdkVersion:29) android.hardware.media.c2@1.1(minSdkVersion:29) android.hardware.media.c2@1.2(minSdkVersion:29) @@ -73,6 +78,7 @@ android.hardware.security.rkp-V3-java(minSdkVersion:33) android.hardware.tetheroffload.config-V1.0-java(minSdkVersion:current) android.hardware.tetheroffload.control-V1.0-java(minSdkVersion:current) android.hardware.tetheroffload.control-V1.1-java(minSdkVersion:current) +android.hardware.threadnetwork-V1-ndk(minSdkVersion:30) android.hardware.uwb-V1-ndk(minSdkVersion:Tiramisu) android.hardware.uwb-V1-rust(minSdkVersion:Tiramisu) android.hardware.wifi-V1-java(minSdkVersion:30) @@ -84,11 +90,14 @@ android.hardware.wifi-V1.3-java(minSdkVersion:30) android.hardware.wifi-V1.4-java(minSdkVersion:30) android.hardware.wifi-V1.5-java(minSdkVersion:30) android.hardware.wifi-V1.6-java(minSdkVersion:30) +android.hardware.wifi-V2-java(minSdkVersion:30) +android.hardware.wifi.common-V1-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1.0-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1.1-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1.2-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1.3-java(minSdkVersion:30) +android.hardware.wifi.hostapd-V2-java(minSdkVersion:30) android.hardware.wifi.supplicant-V1-java(minSdkVersion:30) android.hardware.wifi.supplicant-V1.0-java(minSdkVersion:30) android.hardware.wifi.supplicant-V1.1-java(minSdkVersion:30) @@ -96,6 +105,7 @@ android.hardware.wifi.supplicant-V1.2-java(minSdkVersion:30) android.hardware.wifi.supplicant-V1.3-java(minSdkVersion:30) android.hardware.wifi.supplicant-V1.4-java(minSdkVersion:30) android.hardware.wifi.supplicant-V2-java(minSdkVersion:30) +android.hardware.wifi.supplicant-V3-java(minSdkVersion:30) android.hidl.allocator@1.0(minSdkVersion:29) android.hidl.base-V1.0-java(minSdkVersion:current) android.hidl.manager-V1.0-java(minSdkVersion:30) @@ -110,7 +120,10 @@ android.media.audio.common.types-V1-cpp(minSdkVersion:29) android.media.audio.common.types-V1-ndk(minSdkVersion:29) android.media.audio.common.types-V2-cpp(minSdkVersion:29) android.media.audio.common.types-V2-ndk(minSdkVersion:29) +android.media.audio.common.types-V3-cpp(minSdkVersion:29) +android.media.audio.common.types-V3-ndk(minSdkVersion:29) android.net.ipsec.ike.xml(minSdkVersion:(no version)) +android.permission.flags-aconfig-java(minSdkVersion:30) android.security.rkpd-ndk(minSdkVersion:33) android.security.rkpd-rust(minSdkVersion:33) android.system.suspend-V1-ndk(minSdkVersion:30) @@ -118,103 +131,145 @@ android.system.suspend-V1-ndk(minSdkVersion:Tiramisu) android.system.suspend.control-V1-ndk(minSdkVersion:30) android_checker_annotation_stubs(minSdkVersion:current) android_downloader_lib(minSdkVersion:30) -androidx-constraintlayout_constraintlayout(minSdkVersion:14) +androidx-constraintlayout_constraintlayout(minSdkVersion:19) androidx-constraintlayout_constraintlayout-core(minSdkVersion:24) androidx-constraintlayout_constraintlayout-solver(minSdkVersion:24) -androidx.activity_activity(minSdkVersion:14) -androidx.activity_activity-ktx(minSdkVersion:14) +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:14) +androidx.annotation_annotation-experimental(minSdkVersion:19) androidx.annotation_annotation-jvm(minSdkVersion:24) -androidx.appcompat_appcompat(minSdkVersion:14) -androidx.appcompat_appcompat-resources(minSdkVersion:14) -androidx.appsearch_appsearch(minSdkVersion:14) -androidx.appsearch_appsearch-platform-storage(minSdkVersion:14) +androidx.appcompat_appcompat(minSdkVersion:19) +androidx.appcompat_appcompat-resources(minSdkVersion:19) +androidx.appsearch_appsearch(minSdkVersion:19) +androidx.appsearch_appsearch-platform-storage(minSdkVersion:19) androidx.arch.core_core-common(minSdkVersion:24) -androidx.arch.core_core-runtime(minSdkVersion:14) -androidx.asynclayoutinflater_asynclayoutinflater(minSdkVersion:14) -androidx.autofill_autofill(minSdkVersion:14) -androidx.cardview_cardview(minSdkVersion:14) +androidx.arch.core_core-runtime(minSdkVersion:19) +androidx.asynclayoutinflater_asynclayoutinflater(minSdkVersion:19) +androidx.autofill_autofill(minSdkVersion:19) +androidx.cardview_cardview(minSdkVersion:19) 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-android(minSdkVersion:21) +androidx.compose.animation_animation-core(minSdkVersion:21) +androidx.compose.animation_animation-core-android(minSdkVersion:21) +androidx.compose.foundation_foundation(minSdkVersion:21) +androidx.compose.foundation_foundation-android(minSdkVersion:21) +androidx.compose.foundation_foundation-layout(minSdkVersion:21) +androidx.compose.foundation_foundation-layout-android(minSdkVersion:21) +androidx.compose.material3_material3(minSdkVersion:21) +androidx.compose.material3_material3-android(minSdkVersion:21) +androidx.compose.material_material-icons-core(minSdkVersion:21) +androidx.compose.material_material-icons-core-android(minSdkVersion:21) +androidx.compose.material_material-ripple(minSdkVersion:21) +androidx.compose.material_material-ripple-android(minSdkVersion:21) +androidx.compose.runtime_runtime(minSdkVersion:21) +androidx.compose.runtime_runtime-android(minSdkVersion:21) +androidx.compose.runtime_runtime-livedata(minSdkVersion:21) +androidx.compose.runtime_runtime-saveable(minSdkVersion:21) +androidx.compose.runtime_runtime-saveable-android(minSdkVersion:21) +androidx.compose.ui_ui(minSdkVersion:21) +androidx.compose.ui_ui-android(minSdkVersion:21) +androidx.compose.ui_ui-geometry(minSdkVersion:21) +androidx.compose.ui_ui-geometry-android(minSdkVersion:21) +androidx.compose.ui_ui-graphics(minSdkVersion:21) +androidx.compose.ui_ui-graphics-android(minSdkVersion:21) +androidx.compose.ui_ui-text(minSdkVersion:21) +androidx.compose.ui_ui-text-android(minSdkVersion:21) +androidx.compose.ui_ui-unit(minSdkVersion:21) +androidx.compose.ui_ui-unit-android(minSdkVersion:21) +androidx.compose.ui_ui-util(minSdkVersion:21) +androidx.compose.ui_ui-util-android(minSdkVersion:21) androidx.concurrent_concurrent-futures(minSdkVersion:24) androidx.constraintlayout_constraintlayout-core(minSdkVersion:24) -androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:14) -androidx.core_core(minSdkVersion:14) -androidx.core_core-ktx(minSdkVersion:14) -androidx.cursoradapter_cursoradapter(minSdkVersion:14) -androidx.customview_customview(minSdkVersion:14) -androidx.customview_customview-poolingcontainer(minSdkVersion:14) -androidx.documentfile_documentfile(minSdkVersion:14) -androidx.drawerlayout_drawerlayout(minSdkVersion:14) -androidx.dynamicanimation_dynamicanimation(minSdkVersion:14) -androidx.emoji2_emoji2(minSdkVersion:14) -androidx.emoji2_emoji2-views-helper(minSdkVersion:14) -androidx.exifinterface_exifinterface(minSdkVersion:14) -androidx.fragment_fragment(minSdkVersion:14) -androidx.fragment_fragment-ktx(minSdkVersion:14) -androidx.interpolator_interpolator(minSdkVersion:14) +androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:19) +androidx.core.uwb.backend.aidl_interface-V1-java(minSdkVersion:30) +androidx.core.uwb.backend.aidl_interface-V2-java(minSdkVersion:30) +androidx.core_core(minSdkVersion:19) +androidx.core_core-ktx(minSdkVersion:19) +androidx.cursoradapter_cursoradapter(minSdkVersion:19) +androidx.customview_customview(minSdkVersion:19) +androidx.customview_customview-poolingcontainer(minSdkVersion:19) +androidx.documentfile_documentfile(minSdkVersion:19) +androidx.drawerlayout_drawerlayout(minSdkVersion:19) +androidx.dynamicanimation_dynamicanimation(minSdkVersion:19) +androidx.emoji2_emoji2(minSdkVersion:19) +androidx.emoji2_emoji2-views-helper(minSdkVersion:19) +androidx.exifinterface_exifinterface(minSdkVersion:19) +androidx.fragment_fragment(minSdkVersion:19) +androidx.fragment_fragment-ktx(minSdkVersion:19) +androidx.graphics_graphics-path(minSdkVersion:21) +androidx.interpolator_interpolator(minSdkVersion:19) androidx.javascriptengine_javascriptengine(minSdkVersion:26) -androidx.leanback_leanback(minSdkVersion:17) -androidx.leanback_leanback-grid(minSdkVersion:17) +androidx.leanback_leanback(minSdkVersion:19) +androidx.leanback_leanback-grid(minSdkVersion:19) androidx.leanback_leanback-preference(minSdkVersion:21) -androidx.legacy_legacy-preference-v14(minSdkVersion:14) -androidx.legacy_legacy-support-core-ui(minSdkVersion:14) -androidx.legacy_legacy-support-core-utils(minSdkVersion:14) -androidx.legacy_legacy-support-v13(minSdkVersion:14) -androidx.legacy_legacy-support-v4(minSdkVersion:14) +androidx.legacy_legacy-preference-v14(minSdkVersion:19) +androidx.legacy_legacy-support-core-ui(minSdkVersion:19) +androidx.legacy_legacy-support-core-utils(minSdkVersion:19) +androidx.legacy_legacy-support-v13(minSdkVersion:19) +androidx.legacy_legacy-support-v4(minSdkVersion:19) androidx.lifecycle_lifecycle-common(minSdkVersion:24) androidx.lifecycle_lifecycle-common-java8(minSdkVersion:24) -androidx.lifecycle_lifecycle-extensions(minSdkVersion:14) -androidx.lifecycle_lifecycle-livedata(minSdkVersion:14) -androidx.lifecycle_lifecycle-livedata-core(minSdkVersion:14) -androidx.lifecycle_lifecycle-livedata-core-ktx(minSdkVersion:14) -androidx.lifecycle_lifecycle-process(minSdkVersion:14) -androidx.lifecycle_lifecycle-runtime(minSdkVersion:14) -androidx.lifecycle_lifecycle-runtime-ktx(minSdkVersion:14) -androidx.lifecycle_lifecycle-service(minSdkVersion:14) -androidx.lifecycle_lifecycle-viewmodel(minSdkVersion:14) -androidx.lifecycle_lifecycle-viewmodel-ktx(minSdkVersion:14) -androidx.lifecycle_lifecycle-viewmodel-savedstate(minSdkVersion:14) -androidx.loader_loader(minSdkVersion:14) -androidx.localbroadcastmanager_localbroadcastmanager(minSdkVersion:14) -androidx.media_media(minSdkVersion:14) -androidx.navigation_navigation-common(minSdkVersion:14) -androidx.navigation_navigation-common-ktx(minSdkVersion:14) -androidx.navigation_navigation-fragment(minSdkVersion:14) -androidx.navigation_navigation-fragment-ktx(minSdkVersion:14) -androidx.navigation_navigation-runtime(minSdkVersion:14) -androidx.navigation_navigation-runtime-ktx(minSdkVersion:14) -androidx.navigation_navigation-ui(minSdkVersion:14) -androidx.navigation_navigation-ui-ktx(minSdkVersion:14) -androidx.preference_preference(minSdkVersion:14) -androidx.print_print(minSdkVersion:14) -androidx.profileinstaller_profileinstaller(minSdkVersion:14) -androidx.recyclerview_recyclerview(minSdkVersion:14) -androidx.recyclerview_recyclerview-selection(minSdkVersion:14) +androidx.lifecycle_lifecycle-extensions(minSdkVersion:19) +androidx.lifecycle_lifecycle-livedata(minSdkVersion:19) +androidx.lifecycle_lifecycle-livedata-core(minSdkVersion:19) +androidx.lifecycle_lifecycle-livedata-core-ktx(minSdkVersion:19) +androidx.lifecycle_lifecycle-process(minSdkVersion:19) +androidx.lifecycle_lifecycle-runtime(minSdkVersion:19) +androidx.lifecycle_lifecycle-runtime-ktx(minSdkVersion:19) +androidx.lifecycle_lifecycle-service(minSdkVersion:19) +androidx.lifecycle_lifecycle-viewmodel(minSdkVersion:19) +androidx.lifecycle_lifecycle-viewmodel-compose(minSdkVersion:21) +androidx.lifecycle_lifecycle-viewmodel-ktx(minSdkVersion:19) +androidx.lifecycle_lifecycle-viewmodel-savedstate(minSdkVersion:19) +androidx.loader_loader(minSdkVersion:19) +androidx.localbroadcastmanager_localbroadcastmanager(minSdkVersion:19) +androidx.media_media(minSdkVersion:19) +androidx.navigation_navigation-common(minSdkVersion:19) +androidx.navigation_navigation-common-ktx(minSdkVersion:19) +androidx.navigation_navigation-compose(minSdkVersion:21) +androidx.navigation_navigation-fragment(minSdkVersion:19) +androidx.navigation_navigation-fragment-ktx(minSdkVersion:19) +androidx.navigation_navigation-runtime(minSdkVersion:19) +androidx.navigation_navigation-runtime-ktx(minSdkVersion:19) +androidx.navigation_navigation-ui(minSdkVersion:19) +androidx.navigation_navigation-ui-ktx(minSdkVersion:19) +androidx.preference_preference(minSdkVersion:19) +androidx.print_print(minSdkVersion:19) +androidx.profileinstaller_profileinstaller(minSdkVersion:19) +androidx.recyclerview_recyclerview(minSdkVersion:19) +androidx.recyclerview_recyclerview-selection(minSdkVersion:19) androidx.resourceinspection_resourceinspection-annotation(minSdkVersion:24) androidx.room_room-common(minSdkVersion:24) -androidx.room_room-ktx(minSdkVersion:14) -androidx.room_room-runtime(minSdkVersion:14) -androidx.savedstate_savedstate(minSdkVersion:14) -androidx.savedstate_savedstate-ktx(minSdkVersion:14) -androidx.slidingpanelayout_slidingpanelayout(minSdkVersion:14) -androidx.sqlite_sqlite(minSdkVersion:14) -androidx.sqlite_sqlite-framework(minSdkVersion:14) -androidx.startup_startup-runtime(minSdkVersion:14) -androidx.swiperefreshlayout_swiperefreshlayout(minSdkVersion:14) -androidx.tracing_tracing(minSdkVersion:14) -androidx.transition_transition(minSdkVersion:14) -androidx.vectordrawable_vectordrawable(minSdkVersion:14) -androidx.vectordrawable_vectordrawable-animated(minSdkVersion:14) -androidx.versionedparcelable_versionedparcelable(minSdkVersion:14) -androidx.viewpager2_viewpager2(minSdkVersion:14) -androidx.viewpager_viewpager(minSdkVersion:14) -androidx.webkit_webkit(minSdkVersion:14) -androidx.window.extensions.core_core(minSdkVersion:14) -androidx.window_window(minSdkVersion:14) -androidx.work_work-runtime(minSdkVersion:14) +androidx.room_room-ktx(minSdkVersion:19) +androidx.room_room-runtime(minSdkVersion:19) +androidx.savedstate_savedstate(minSdkVersion:19) +androidx.savedstate_savedstate-ktx(minSdkVersion:19) +androidx.slidingpanelayout_slidingpanelayout(minSdkVersion:19) +androidx.sqlite_sqlite(minSdkVersion:19) +androidx.sqlite_sqlite-framework(minSdkVersion:19) +androidx.startup_startup-runtime(minSdkVersion:19) +androidx.swiperefreshlayout_swiperefreshlayout(minSdkVersion:19) +androidx.tracing_tracing(minSdkVersion:19) +androidx.transition_transition(minSdkVersion:19) +androidx.vectordrawable_vectordrawable(minSdkVersion:19) +androidx.vectordrawable_vectordrawable-animated(minSdkVersion:19) +androidx.versionedparcelable_versionedparcelable(minSdkVersion:19) +androidx.viewpager2_viewpager2(minSdkVersion:19) +androidx.viewpager_viewpager(minSdkVersion:19) +androidx.wear.compose_compose-foundation(minSdkVersion:25) +androidx.wear.compose_compose-material(minSdkVersion:25) +androidx.wear.compose_compose-material-core(minSdkVersion:25) +androidx.wear.compose_compose-navigation(minSdkVersion:25) +androidx.wear_wear(minSdkVersion:23) +androidx.webkit_webkit(minSdkVersion:19) +androidx.window.extensions.core_core(minSdkVersion:19) +androidx.window_window(minSdkVersion:19) +androidx.work_work-runtime(minSdkVersion:19) apache-commons-compress(minSdkVersion:29) apache-commons-compress(minSdkVersion:current) apache-commons-io(minSdkVersion:33) @@ -239,6 +294,7 @@ bpf_syscall_wrappers(minSdkVersion:30) brotli-java(minSdkVersion:29) brotli-java(minSdkVersion:current) captiveportal-lib(minSdkVersion:29) +captiveportal-lib(minSdkVersion:30) car-rotary-lib(minSdkVersion:28) car-rotary-lib-overlayable-resources(minSdkVersion:28) car-rotary-lib-resources(minSdkVersion:28) @@ -252,8 +308,18 @@ cellbroadcast-java-proto-lite(minSdkVersion:current) census(minSdkVersion:30) clatd(minSdkVersion:30) codecs_g711dec(minSdkVersion:29) +com.android.media.audioserver-aconfig-cc(minSdkVersion:29) com.android.vcard(minSdkVersion:9) -com.google.android.material_material(minSdkVersion:14) +com.google.android.material_material(minSdkVersion:19) +com.uwb.support.base(minSdkVersion:30) +com.uwb.support.ccc(minSdkVersion:30) +com.uwb.support.dltdoa(minSdkVersion:30) +com.uwb.support.fira(minSdkVersion:30) +com.uwb.support.generic(minSdkVersion:30) +com.uwb.support.multichip(minSdkVersion:30) +com.uwb.support.oemextension(minSdkVersion:30) +com.uwb.support.profile(minSdkVersion:30) +com.uwb.support.radar(minSdkVersion:30) connectivity_native_aidl_interface-V1-java(minSdkVersion:30) conscrypt(minSdkVersion:29) core-libart(minSdkVersion:31) @@ -262,33 +328,44 @@ crtbegin_dynamic(minSdkVersion:16) crtbegin_dynamic(minSdkVersion:apex_inherit) crtbegin_dynamic1(minSdkVersion:apex_inherit) crtbegin_so(minSdkVersion:16) +crtbegin_so(minSdkVersion:29) crtbegin_so(minSdkVersion:30) crtbegin_so(minSdkVersion:apex_inherit) crtbegin_so(minSdkVersion:current) +crtbegin_so(minSdkVersion:VanillaIceCream) crtbegin_so1(minSdkVersion:apex_inherit) crtbrand(minSdkVersion:16) +crtbrand(minSdkVersion:29) crtbrand(minSdkVersion:30) crtbrand(minSdkVersion:apex_inherit) crtbrand(minSdkVersion:current) +crtbrand(minSdkVersion:VanillaIceCream) crtend_android(minSdkVersion:16) crtend_android(minSdkVersion:apex_inherit) crtend_so(minSdkVersion:16) +crtend_so(minSdkVersion:29) crtend_so(minSdkVersion:30) crtend_so(minSdkVersion:apex_inherit) crtend_so(minSdkVersion:current) +crtend_so(minSdkVersion:VanillaIceCream) dagger2(minSdkVersion:current) datastallprotosnano(minSdkVersion:29) dlmalloc(minSdkVersion:apex_inherit) dnsproxyd_protocol_headers(minSdkVersion:29) +dnsproxyd_protocol_headers(minSdkVersion:30) DocumentsUI-res-lib(minSdkVersion:29) -exoplayer-annotation_stubs(minSdkVersion:16) -exoplayer-media_apex(minSdkVersion:16) -exoplayer-mediaprovider-core(minSdkVersion:16) -exoplayer-mediaprovider-ui(minSdkVersion:16) +ethtool(minSdkVersion:30) +exoplayer-annotation_stubs(minSdkVersion:19) +exoplayer-media_apex(minSdkVersion:19) +exoplayer-mediaprovider-core(minSdkVersion:19) +exoplayer-mediaprovider-ui(minSdkVersion:19) +expresslog-catalog(minSdkVersion:30) ExtServices(minSdkVersion:30) ExtServices(minSdkVersion:current) ExtServices-core(minSdkVersion:30) ExtServices-core(minSdkVersion:current) +ExtServices-tplus(minSdkVersion:30) +ExtServices-tplus(minSdkVersion:current) flatbuffer_headers(minSdkVersion:(no version)) flatbuffer_headers(minSdkVersion:apex_inherit) flatbuffers-java(minSdkVersion:30) @@ -318,10 +395,20 @@ GoogleExtServices(minSdkVersion:30) GooglePermissionController(minSdkVersion:28) GooglePermissionController(minSdkVersion:30) gpr_base(minSdkVersion:30) +grpc-java-annotation-stubs(minSdkVersion:30) +grpc-java-api(minSdkVersion:30) +grpc-java-context(minSdkVersion:30) +grpc-java-core(minSdkVersion:30) +grpc-java-core-android(minSdkVersion:30) +grpc-java-core-internal(minSdkVersion:30) +grpc-java-core-util(minSdkVersion:30) +grpc-java-okhttp(minSdkVersion:30) +grpc-java-protobuf-lite(minSdkVersion:30) +grpc-java-stub(minSdkVersion:30) guava(minSdkVersion:current) guava-android-annotation-stubs(minSdkVersion:30) gwp_asan_headers(minSdkVersion:S) -hilt_android(minSdkVersion:14) +hilt_android(minSdkVersion:19) hilt_core(minSdkVersion:current) icing-java-proto-lite(minSdkVersion:current) iconloader(minSdkVersion:21) @@ -330,6 +417,7 @@ iconloader_sc_mainline_prod(minSdkVersion:26) internal_include_headers(minSdkVersion:30) ipmemorystore-aidl-interfaces-java(minSdkVersion:29) ipmemorystore-aidl-interfaces-V10-java(minSdkVersion:29) +ipmemorystore-aidl-interfaces-V10-java(minSdkVersion:30) jacocoagent(minSdkVersion:9) jni_headers(minSdkVersion:29) jni_platform_headers(minSdkVersion:S) @@ -338,11 +426,14 @@ jsr330(minSdkVersion:current) kotlinx-coroutines-android(minSdkVersion:28) kotlinx-coroutines-android(minSdkVersion:current) kotlinx-coroutines-core(minSdkVersion:current) +kotlinx-coroutines-core-jvm(minSdkVersion:28) kotlinx_atomicfu(minSdkVersion:current) kotlinx_coroutines(minSdkVersion:28) kotlinx_coroutines_android(minSdkVersion:28) ksoap2(minSdkVersion:30) libaacextractor(minSdkVersion:29) +libaconfig_java_proto_lite(minSdkVersion:34) +libaconfig_java_proto_lite(minSdkVersion:UpsideDownCake) libadbconnection_server(minSdkVersion:(no version)) libadbconnection_server(minSdkVersion:30) libadbd_core(minSdkVersion:(no version)) @@ -387,6 +478,7 @@ libbase64_rust(minSdkVersion:29) libbase_headers(minSdkVersion:29) libbase_ndk(minSdkVersion:29) libbinder_headers(minSdkVersion:29) +libbinder_headers_base(minSdkVersion:29) libbinder_headers_platform_shared(minSdkVersion:29) libbinder_ndk_bindgen(minSdkVersion:Tiramisu) libbinder_ndk_sys(minSdkVersion:Tiramisu) @@ -394,6 +486,7 @@ libbinder_rs(minSdkVersion:Tiramisu) libbinder_tokio_rs(minSdkVersion:Tiramisu) libbinderthreadstateutils(minSdkVersion:29) libbitflags(minSdkVersion:29) +libbitflags-1.3.2(minSdkVersion:29) libbluetooth-types(minSdkVersion:29) libbluetooth-types-header(minSdkVersion:29) libbluetooth_headers(minSdkVersion:30) @@ -421,6 +514,9 @@ libcfg_if(minSdkVersion:29) libcfg_if.rust_sysroot(minSdkVersion:29) libchrome(minSdkVersion:30) libcodec2(minSdkVersion:29) +libcodec2_aidl(minSdkVersion:30) +libcodec2_hal_common(minSdkVersion:29) +libcodec2_hal_selection_static(minSdkVersion:29) libcodec2_headers(minSdkVersion:29) libcodec2_hidl@1.0(minSdkVersion:29) libcodec2_hidl@1.1(minSdkVersion:29) @@ -432,6 +528,7 @@ libcodec2_soft_amrnbdec(minSdkVersion:29) libcodec2_soft_amrnbenc(minSdkVersion:29) libcodec2_soft_amrwbdec(minSdkVersion:29) libcodec2_soft_amrwbenc(minSdkVersion:29) +libcodec2_soft_av1dec_dav1d(minSdkVersion:29) libcodec2_soft_av1dec_gav1(minSdkVersion:29) libcodec2_soft_av1enc(minSdkVersion:29) libcodec2_soft_avcdec(minSdkVersion:29) @@ -474,6 +571,9 @@ libcutils_headers(minSdkVersion:29) libcutils_sockets(minSdkVersion:29) libcxx(minSdkVersion:29) libcxxbridge05(minSdkVersion:29) +libdav1d(minSdkVersion:29) +libdav1d_16bit(minSdkVersion:29) +libdav1d_8bit(minSdkVersion:29) libdexfile_external_headers(minSdkVersion:31) libdexfile_support(minSdkVersion:31) libdiagnose_usb(minSdkVersion:(no version)) @@ -481,6 +581,7 @@ libdiagnose_usb(minSdkVersion:apex_inherit) libdmabufheap(minSdkVersion:29) libdmabufinfo(minSdkVersion:S) libdoh_ffi(minSdkVersion:29) +libdoh_ffi(minSdkVersion:30) libdowncast_rs(minSdkVersion:29) libeigen(minSdkVersion:(no version)) libeigen(minSdkVersion:apex_inherit) @@ -489,6 +590,7 @@ liberror_headers(minSdkVersion:29) libevent(minSdkVersion:30) libexpat(minSdkVersion:apex_inherit) libexpectedutils_headers(minSdkVersion:29) +libexpresslog_jni(minSdkVersion:30) libextservices(minSdkVersion:30) libextservices_jni(minSdkVersion:30) libfft2d(minSdkVersion:30) @@ -497,11 +599,14 @@ libFLAC(minSdkVersion:29) libFLAC-config(minSdkVersion:29) libFLAC-headers(minSdkVersion:29) libflacextractor(minSdkVersion:29) +libflags_rust(minSdkVersion:33) +libflags_rust_cpp_bridge(minSdkVersion:33) libflatbuffers-cpp(minSdkVersion:30) libfmq(minSdkVersion:29) libfmq-base(minSdkVersion:29) libform_urlencoded(minSdkVersion:29) libFraunhoferAAC(minSdkVersion:29) +libfstab(minSdkVersion:31) libfuse(minSdkVersion:30) libfuse_jni(minSdkVersion:30) libfutures(minSdkVersion:29) @@ -524,6 +629,7 @@ libgrpc++_codegen_base_src(minSdkVersion:30) libgrpc_base(minSdkVersion:30) libgrpc_base_c(minSdkVersion:30) libgrpc_bindgen(minSdkVersion:29) +libgrpc_census(minSdkVersion:30) libgrpc_client_authority_filter(minSdkVersion:30) libgrpc_client_channel(minSdkVersion:30) libgrpc_deadline_filter(minSdkVersion:30) @@ -531,6 +637,7 @@ libgrpc_http_filters(minSdkVersion:30) libgrpc_lb_policy_grpclb_secure(minSdkVersion:30) libgrpc_lb_policy_pick_first(minSdkVersion:30) libgrpc_lb_policy_round_robin(minSdkVersion:30) +libgrpc_lb_policy_xds_secure(minSdkVersion:30) libgrpc_max_age_filter(minSdkVersion:30) libgrpc_message_size_filter(minSdkVersion:30) libgrpc_resolver_dns_ares(minSdkVersion:30) @@ -550,13 +657,17 @@ libgrpc_transport_chttp2_server_secure(minSdkVersion:30) libgrpc_transport_inproc(minSdkVersion:30) libgrpc_workaround_cronet_compression_filter(minSdkVersion:30) libgrpc_wrap(minSdkVersion:29) +libgrpchealth_proto(minSdkVersion:30) libgrpcio(minSdkVersion:29) libgrpcio_sys(minSdkVersion:29) +libgrpclb_proto(minSdkVersion:30) +libgsi_headers(minSdkVersion:31) libgsm(minSdkVersion:apex_inherit) libgtest_prod(minSdkVersion:apex_inherit) libgtest_prod_headers(minSdkVersion:apex_inherit) libgui_bufferqueue_static(minSdkVersion:29) libgui_headers(minSdkVersion:29) +libguiflags(minSdkVersion:29) libhardware(minSdkVersion:29) libhardware_headers(minSdkVersion:29) libhashbrown.rust_sysroot(minSdkVersion:29) @@ -634,8 +745,11 @@ libnet_utils_device_common_bpfjni(minSdkVersion:30) libnet_utils_device_common_bpfutils(minSdkVersion:30) libnetdbinder_utils_headers(minSdkVersion:29) libnetdutils(minSdkVersion:29) +libnetdutils(minSdkVersion:30) libnetjniutils(minSdkVersion:29) +libnetjniutils(minSdkVersion:30) libnetworkstackutilsjni(minSdkVersion:29) +libnetworkstackutilsjni(minSdkVersion:30) libneuralnetworks_common(minSdkVersion:(no version)) libneuralnetworks_common(minSdkVersion:30) libneuralnetworks_headers(minSdkVersion:(no version)) @@ -652,6 +766,7 @@ libopus(minSdkVersion:29) libpanic_abort.rust_sysroot(minSdkVersion:29) libparking_lot(minSdkVersion:29) libparking_lot_core(minSdkVersion:29) +libpdl_runtime(minSdkVersion:33) libpercent_encoding(minSdkVersion:29) libperfetto_client_experimental(minSdkVersion:30) libperfetto_client_experimental(minSdkVersion:S) @@ -740,6 +855,7 @@ libstd_detect.rust_sysroot(minSdkVersion:29) libsync(minSdkVersion:(no version)) libsystem_headers(minSdkVersion:apex_inherit) libsystem_properties_bindgen(minSdkVersion:29) +libsystem_properties_bindgen_sys(minSdkVersion:29) libsysutils(minSdkVersion:apex_inherit) libtcutils(minSdkVersion:30) libterm(minSdkVersion:29) @@ -783,9 +899,13 @@ libutf(minSdkVersion:14) libutils(minSdkVersion:29) libutils(minSdkVersion:30) libutils(minSdkVersion:apex_inherit) +libutils_binder(minSdkVersion:29) +libutils_binder(minSdkVersion:30) +libutils_binder(minSdkVersion:apex_inherit) libutils_headers(minSdkVersion:29) libutils_headers(minSdkVersion:30) libutils_headers(minSdkVersion:apex_inherit) +libuwb_aconfig_flags_rust(minSdkVersion:33) libuwb_uci_packets(minSdkVersion:Tiramisu) libvorbisidec(minSdkVersion:29) libvpx(minSdkVersion:29) @@ -799,9 +919,8 @@ libzeroize(minSdkVersion:Tiramisu) libziparchive(minSdkVersion:apex_inherit) libzstd(minSdkVersion:(no version)) libzstd(minSdkVersion:apex_inherit) -lottie(minSdkVersion:16) +lottie(minSdkVersion:19) marisa-trie(minSdkVersion:30) -mdns_aidl_interface-lateststable-java(minSdkVersion:30) mdns_aidl_interface-V1-java(minSdkVersion:30) media_ndk_headers(minSdkVersion:29) media_plugin_headers(minSdkVersion:29) @@ -818,6 +937,8 @@ modules-utils-binary-xml(minSdkVersion:29) modules-utils-build(minSdkVersion:29) modules-utils-build_system(minSdkVersion:29) modules-utils-bytesmatcher(minSdkVersion:29) +modules-utils-expresslog(minSdkVersion:30) +modules-utils-fastxmlserializer(minSdkVersion:29) modules-utils-handlerexecutor(minSdkVersion:29) modules-utils-list-slice(minSdkVersion:30) modules-utils-locallog(minSdkVersion:30) @@ -837,17 +958,27 @@ ndk_libc++_static(minSdkVersion:16) ndk_libc++abi(minSdkVersion:(no version)) ndk_libc++abi(minSdkVersion:16) ndk_libunwind(minSdkVersion:16) +ndk_system(minSdkVersion:(no version)) net-utils-device-common(minSdkVersion:29) +net-utils-device-common(minSdkVersion:30) net-utils-device-common-bpf(minSdkVersion:29) +net-utils-device-common-bpf(minSdkVersion:30) net-utils-device-common-ip(minSdkVersion:29) +net-utils-device-common-ip(minSdkVersion:30) net-utils-device-common-netlink(minSdkVersion:29) +net-utils-device-common-netlink(minSdkVersion:30) net-utils-device-common-struct(minSdkVersion:29) +net-utils-device-common-struct(minSdkVersion:30) net-utils-framework-common(minSdkVersion:29) +net-utils-framework-common(minSdkVersion:30) net-utils-framework-common(minSdkVersion:current) net-utils-services-common(minSdkVersion:30) +netbpfload(minSdkVersion:30) netd-client(minSdkVersion:29) +netd-client(minSdkVersion:30) netd_aidl_interface-java(minSdkVersion:29) netd_aidl_interface-lateststable-java(minSdkVersion:29) +netd_aidl_interface-lateststable-java(minSdkVersion:30) netd_aidl_interface-lateststable-ndk(minSdkVersion:29) netd_aidl_interface-V10-java(minSdkVersion:29) netd_aidl_interface-V10-ndk(minSdkVersion:29) @@ -856,7 +987,11 @@ netd_aidl_interface-V11-ndk(minSdkVersion:29) netd_aidl_interface-V12-java(minSdkVersion:29) netd_aidl_interface-V12-ndk(minSdkVersion:29) netd_aidl_interface-V13-java(minSdkVersion:29) +netd_aidl_interface-V13-java(minSdkVersion:30) netd_aidl_interface-V13-ndk(minSdkVersion:29) +netd_aidl_interface-V13-ndk(minSdkVersion:30) +netd_aidl_interface-V14-java(minSdkVersion:30) +netd_aidl_interface-V14-ndk(minSdkVersion:30) netd_aidl_interface-V3-java(minSdkVersion:29) netd_aidl_interface-V5-java(minSdkVersion:29) netd_aidl_interface-V6-java(minSdkVersion:29) @@ -867,9 +1002,12 @@ netd_aidl_interface-V9-java(minSdkVersion:29) netd_aidl_interface-V9-ndk(minSdkVersion:29) netd_event_listener_interface-java(minSdkVersion:29) netd_event_listener_interface-lateststable-java(minSdkVersion:29) +netd_event_listener_interface-lateststable-java(minSdkVersion:30) netd_event_listener_interface-ndk_platform(minSdkVersion:29) netd_event_listener_interface-V1-java(minSdkVersion:29) +netd_event_listener_interface-V1-java(minSdkVersion:30) netd_event_listener_interface-V1-ndk(minSdkVersion:29) +netd_event_listener_interface-V1-ndk(minSdkVersion:30) netd_event_listener_interface-V1-ndk_platform(minSdkVersion:29) netd_mainline_headers(minSdkVersion:29) netlink-client(minSdkVersion:29) @@ -882,21 +1020,38 @@ networkstack-aidl-interfaces-V15-java(minSdkVersion:29) networkstack-aidl-interfaces-V16-java(minSdkVersion:29) networkstack-aidl-interfaces-V17-java(minSdkVersion:29) networkstack-aidl-interfaces-V18-java(minSdkVersion:29) +networkstack-aidl-interfaces-V18-java(minSdkVersion:30) +networkstack-aidl-interfaces-V19-java(minSdkVersion:30) +networkstack-aidl-interfaces-V20-java(minSdkVersion:30) networkstack-aidl-latest(minSdkVersion:29) +networkstack-aidl-latest(minSdkVersion:30) networkstack-client(minSdkVersion:29) +networkstack-client(minSdkVersion:30) NetworkStackApi29Shims(minSdkVersion:29) +NetworkStackApi29Shims(minSdkVersion:30) NetworkStackApi30Shims(minSdkVersion:29) +NetworkStackApi30Shims(minSdkVersion:30) NetworkStackApi31Shims(minSdkVersion:29) +NetworkStackApi31Shims(minSdkVersion:30) NetworkStackApi33Shims(minSdkVersion:29) +NetworkStackApi33Shims(minSdkVersion:30) NetworkStackApi34Shims(minSdkVersion:29) +NetworkStackApi34Shims(minSdkVersion:30) NetworkStackApi35Shims(minSdkVersion:29) +NetworkStackApi35Shims(minSdkVersion:30) NetworkStackApiCurrentLib(minSdkVersion:29) +NetworkStackApiCurrentLib(minSdkVersion:30) NetworkStackApiCurrentShims(minSdkVersion:29) +NetworkStackApiCurrentShims(minSdkVersion:30) NetworkStackApiStableLib(minSdkVersion:29) +NetworkStackApiStableLib(minSdkVersion:30) NetworkStackApiStableShims(minSdkVersion:29) +NetworkStackApiStableShims(minSdkVersion:30) NetworkStackNextManifestBase(minSdkVersion:29) +NetworkStackNextManifestBase(minSdkVersion:30) networkstackprotos(minSdkVersion:29) NetworkStackShimsCommon(minSdkVersion:29) +NetworkStackShimsCommon(minSdkVersion:30) neuralnetworks_supportlibrary_loader(minSdkVersion:29) neuralnetworks_types(minSdkVersion:30) neuralnetworks_utils_hal_1_0(minSdkVersion:30) @@ -910,6 +1065,7 @@ note_memtag_heap_async(minSdkVersion:16) note_memtag_heap_sync(minSdkVersion:16) offlinelocationtimezoneprovider(minSdkVersion:31) okhttp(minSdkVersion:31) +okhttp-norepackage(minSdkVersion:30) okio-lib(minSdkVersion:30) opencensus-java-api(minSdkVersion:33) opencensus-java-api(minSdkVersion:current) @@ -918,8 +1074,14 @@ opencensus-java-contrib-grpc-metrics(minSdkVersion:current) OsuLoginGoogle(minSdkVersion:30) owasp-java-encoder(minSdkVersion:33) perfetto_trace_protos(minSdkVersion:S) +perfmark(minSdkVersion:30) +perfmark-impl(minSdkVersion:30) +perfmark-link(minSdkVersion:30) +perfmark-stringfunction(minSdkVersion:30) +perfmark-tag(minSdkVersion:30) PermissionController(minSdkVersion:28) PermissionController(minSdkVersion:30) +permissioncontroller-protos(minSdkVersion:30) permissioncontroller-statsd(minSdkVersion:current) philox_random(minSdkVersion:(no version)) philox_random(minSdkVersion:30) @@ -928,36 +1090,37 @@ philox_random_headers(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:14) +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:14) +prebuilt_androidx.activity_activity-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.activity_activity-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.activity_activity-nodeps(minSdkVersion:14) +prebuilt_androidx.activity_activity-nodeps(minSdkVersion:19) prebuilt_androidx.annotation_annotation-experimental-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.annotation_annotation-experimental-nodeps(minSdkVersion:14) +prebuilt_androidx.annotation_annotation-experimental-nodeps(minSdkVersion:19) prebuilt_androidx.annotation_annotation-jvm-nodeps(minSdkVersion:24) prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:24) prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:30) prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:current) prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:14) +prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:19) prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:14) -prebuilt_androidx.appsearch_appsearch-nodeps(minSdkVersion:14) -prebuilt_androidx.appsearch_appsearch-platform-storage-nodeps(minSdkVersion:14) +prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:19) +prebuilt_androidx.appsearch_appsearch-nodeps(minSdkVersion:19) +prebuilt_androidx.appsearch_appsearch-platform-storage-nodeps(minSdkVersion:19) prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:24) prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:30) prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:current) prebuilt_androidx.arch.core_core-runtime-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.arch.core_core-runtime-nodeps(minSdkVersion:14) +prebuilt_androidx.arch.core_core-runtime-nodeps(minSdkVersion:19) prebuilt_androidx.asynclayoutinflater_asynclayoutinflater-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.asynclayoutinflater_asynclayoutinflater-nodeps(minSdkVersion:14) +prebuilt_androidx.asynclayoutinflater_asynclayoutinflater-nodeps(minSdkVersion:19) prebuilt_androidx.autofill_autofill-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.autofill_autofill-nodeps(minSdkVersion:14) +prebuilt_androidx.autofill_autofill-nodeps(minSdkVersion:19) prebuilt_androidx.cardview_cardview-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.cardview_cardview-nodeps(minSdkVersion:14) +prebuilt_androidx.cardview_cardview-nodeps(minSdkVersion:19) prebuilt_androidx.collection_collection-jvm-nodeps(minSdkVersion:24) prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:24) prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:30) @@ -965,47 +1128,79 @@ prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:current) 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-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.animation_animation-core-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.animation_animation-core-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.animation_animation-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.foundation_foundation-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.foundation_foundation-layout-android-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-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.material3_material3-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.material_material-icons-core-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.material_material-icons-core-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.material_material-ripple-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.material_material-ripple-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.runtime_runtime-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.runtime_runtime-livedata-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.runtime_runtime-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.runtime_runtime-saveable-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.runtime_runtime-saveable-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-geometry-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-geometry-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-graphics-android-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-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-text-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-unit-android-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-unit-nodeps(minSdkVersion:21) +prebuilt_androidx.compose.ui_ui-util-android-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)) -prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:14) +prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:19) prebuilt_androidx.core_core-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.core_core-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.core_core-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.core_core-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.core_core-nodeps(minSdkVersion:14) +prebuilt_androidx.core_core-nodeps(minSdkVersion:19) prebuilt_androidx.cursoradapter_cursoradapter-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.cursoradapter_cursoradapter-nodeps(minSdkVersion:14) +prebuilt_androidx.cursoradapter_cursoradapter-nodeps(minSdkVersion:19) prebuilt_androidx.customview_customview-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.customview_customview-nodeps(minSdkVersion:14) -prebuilt_androidx.customview_customview-poolingcontainer-nodeps(minSdkVersion:14) +prebuilt_androidx.customview_customview-nodeps(minSdkVersion:19) +prebuilt_androidx.customview_customview-poolingcontainer-nodeps(minSdkVersion:19) prebuilt_androidx.documentfile_documentfile-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.documentfile_documentfile-nodeps(minSdkVersion:14) +prebuilt_androidx.documentfile_documentfile-nodeps(minSdkVersion:19) prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:14) -prebuilt_androidx.dynamicanimation_dynamicanimation-nodeps(minSdkVersion:14) -prebuilt_androidx.emoji2_emoji-nodeps(minSdkVersion:14) -prebuilt_androidx.emoji2_emoji2-nodeps(minSdkVersion:14) -prebuilt_androidx.emoji2_emoji2-views-helpe-nodeps(minSdkVersion:14) -prebuilt_androidx.emoji2_emoji2-views-helper-nodeps(minSdkVersion:14) -prebuilt_androidx.exifinterface_exifinterface-nodeps(minSdkVersion:14) +prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:19) +prebuilt_androidx.dynamicanimation_dynamicanimation-nodeps(minSdkVersion:19) +prebuilt_androidx.emoji2_emoji-nodeps(minSdkVersion:19) +prebuilt_androidx.emoji2_emoji2-nodeps(minSdkVersion:19) +prebuilt_androidx.emoji2_emoji2-views-helpe-nodeps(minSdkVersion:19) +prebuilt_androidx.emoji2_emoji2-views-helper-nodeps(minSdkVersion:19) +prebuilt_androidx.exifinterface_exifinterface-nodeps(minSdkVersion:19) prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.fragment_fragment-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.fragment_fragment-nodeps(minSdkVersion:14) +prebuilt_androidx.fragment_fragment-nodeps(minSdkVersion:19) +prebuilt_androidx.graphics_graphics-path-nodeps(minSdkVersion:21) prebuilt_androidx.interpolator_interpolator-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.interpolator_interpolator-nodeps(minSdkVersion:14) +prebuilt_androidx.interpolator_interpolator-nodeps(minSdkVersion:19) prebuilt_androidx.javascriptengine_javascriptengine-nodeps(minSdkVersion:26) -prebuilt_androidx.leanback_leanback-grid-nodeps(minSdkVersion:17) +prebuilt_androidx.leanback_leanback-grid-nodeps(minSdkVersion:19) prebuilt_androidx.leanback_leanback-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.leanback_leanback-nodeps(minSdkVersion:17) +prebuilt_androidx.leanback_leanback-nodeps(minSdkVersion:19) prebuilt_androidx.leanback_leanback-preference-nodeps(minSdkVersion:(no version)) prebuilt_androidx.leanback_leanback-preference-nodeps(minSdkVersion:21) prebuilt_androidx.legacy_legacy-support-core-ui-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.legacy_legacy-support-core-ui-nodeps(minSdkVersion:14) +prebuilt_androidx.legacy_legacy-support-core-ui-nodeps(minSdkVersion:19) prebuilt_androidx.legacy_legacy-support-core-utils-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.legacy_legacy-support-core-utils-nodeps(minSdkVersion:14) +prebuilt_androidx.legacy_legacy-support-core-utils-nodeps(minSdkVersion:19) prebuilt_androidx.legacy_legacy-support-v13-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.legacy_legacy-support-v13-nodeps(minSdkVersion:14) +prebuilt_androidx.legacy_legacy-support-v13-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-common-java8-nodeps(minSdkVersion:24) prebuilt_androidx.lifecycle_lifecycle-common-java8-nodeps(minSdkVersion:30) prebuilt_androidx.lifecycle_lifecycle-common-java8-nodeps(minSdkVersion:current) @@ -1013,88 +1208,95 @@ prebuilt_androidx.lifecycle_lifecycle-common-nodeps(minSdkVersion:24) prebuilt_androidx.lifecycle_lifecycle-common-nodeps(minSdkVersion:30) prebuilt_androidx.lifecycle_lifecycle-common-nodeps(minSdkVersion:current) prebuilt_androidx.lifecycle_lifecycle-extensions-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-extensions-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-extensions-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-livedata-core-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-livedata-core-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-livedata-core-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-livedata-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-livedata-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-livedata-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-runtime-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-runtime-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-runtime-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-service-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-service-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-service-nodeps(minSdkVersion:19) +prebuilt_androidx.lifecycle_lifecycle-viewmodel-compose-nodeps(minSdkVersion:21) prebuilt_androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-viewmodel-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-viewmodel-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-viewmodel-nodeps(minSdkVersion:19) prebuilt_androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps(minSdkVersion:14) +prebuilt_androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps(minSdkVersion:19) prebuilt_androidx.loader_loader-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.loader_loader-nodeps(minSdkVersion:14) +prebuilt_androidx.loader_loader-nodeps(minSdkVersion:19) prebuilt_androidx.localbroadcastmanager_localbroadcastmanager-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.localbroadcastmanager_localbroadcastmanager-nodeps(minSdkVersion:14) +prebuilt_androidx.localbroadcastmanager_localbroadcastmanager-nodeps(minSdkVersion:19) prebuilt_androidx.media_media-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.media_media-nodeps(minSdkVersion:14) +prebuilt_androidx.media_media-nodeps(minSdkVersion:19) prebuilt_androidx.navigation_navigation-common-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-common-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-common-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.navigation_navigation-common-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-common-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-common-nodeps(minSdkVersion:19) +prebuilt_androidx.navigation_navigation-compose-nodeps(minSdkVersion:21) prebuilt_androidx.navigation_navigation-fragment-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-fragment-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-fragment-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.navigation_navigation-fragment-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-fragment-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-fragment-nodeps(minSdkVersion:19) prebuilt_androidx.navigation_navigation-runtime-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-runtime-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-runtime-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.navigation_navigation-runtime-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-runtime-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-runtime-nodeps(minSdkVersion:19) prebuilt_androidx.navigation_navigation-ui-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-ui-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-ui-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.navigation_navigation-ui-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-ui-nodeps(minSdkVersion:14) +prebuilt_androidx.navigation_navigation-ui-nodeps(minSdkVersion:19) prebuilt_androidx.preference_preference-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.preference_preference-nodeps(minSdkVersion:14) +prebuilt_androidx.preference_preference-nodeps(minSdkVersion:19) prebuilt_androidx.print_print-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.print_print-nodeps(minSdkVersion:14) -prebuilt_androidx.profileinstaller_profileinstaller-nodeps(minSdkVersion:14) +prebuilt_androidx.print_print-nodeps(minSdkVersion:19) +prebuilt_androidx.profileinstaller_profileinstaller-nodeps(minSdkVersion:19) prebuilt_androidx.recyclerview_recyclerview-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.recyclerview_recyclerview-nodeps(minSdkVersion:14) +prebuilt_androidx.recyclerview_recyclerview-nodeps(minSdkVersion:19) prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:14) +prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:19) prebuilt_androidx.resourceinspection_resourceinspection-annotation-nodeps(minSdkVersion:24) prebuilt_androidx.room_room-common-nodeps(minSdkVersion:24) -prebuilt_androidx.room_room-ktx-nodeps(minSdkVersion:14) -prebuilt_androidx.room_room-runtime-nodeps(minSdkVersion:14) -prebuilt_androidx.savedstate_savedstate-ktx-nodeps(minSdkVersion:14) +prebuilt_androidx.room_room-ktx-nodeps(minSdkVersion:19) +prebuilt_androidx.room_room-runtime-nodeps(minSdkVersion:19) +prebuilt_androidx.savedstate_savedstate-ktx-nodeps(minSdkVersion:19) prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:14) +prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:19) prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:14) -prebuilt_androidx.sqlite_sqlite-framework-nodeps(minSdkVersion:14) -prebuilt_androidx.sqlite_sqlite-nodeps(minSdkVersion:14) -prebuilt_androidx.startup_startup-runtime-nodeps(minSdkVersion:14) +prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:19) +prebuilt_androidx.sqlite_sqlite-framework-nodeps(minSdkVersion:19) +prebuilt_androidx.sqlite_sqlite-nodeps(minSdkVersion:19) +prebuilt_androidx.startup_startup-runtime-nodeps(minSdkVersion:19) prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:14) -prebuilt_androidx.tracing_tracing-nodeps(minSdkVersion:14) +prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:19) +prebuilt_androidx.tracing_tracing-nodeps(minSdkVersion:19) prebuilt_androidx.transition_transition-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.transition_transition-nodeps(minSdkVersion:14) +prebuilt_androidx.transition_transition-nodeps(minSdkVersion:19) prebuilt_androidx.vectordrawable_vectordrawable-animated-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.vectordrawable_vectordrawable-animated-nodeps(minSdkVersion:14) +prebuilt_androidx.vectordrawable_vectordrawable-animated-nodeps(minSdkVersion:19) prebuilt_androidx.vectordrawable_vectordrawable-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.vectordrawable_vectordrawable-nodeps(minSdkVersion:14) +prebuilt_androidx.vectordrawable_vectordrawable-nodeps(minSdkVersion:19) prebuilt_androidx.versionedparcelable_versionedparcelable-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.versionedparcelable_versionedparcelable-nodeps(minSdkVersion:14) -prebuilt_androidx.viewpager2_viewpager2-nodeps(minSdkVersion:14) +prebuilt_androidx.versionedparcelable_versionedparcelable-nodeps(minSdkVersion:19) +prebuilt_androidx.viewpager2_viewpager2-nodeps(minSdkVersion:19) prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:14) -prebuilt_androidx.webkit_webkit-nodeps(minSdkVersion:14) -prebuilt_androidx.window.extensions.core_core-nodeps(minSdkVersion:14) -prebuilt_androidx.window_window-nodeps(minSdkVersion:14) -prebuilt_androidx.work_work-runtime-nodeps(minSdkVersion:14) +prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:19) +prebuilt_androidx.wear.compose_compose-foundation-nodeps(minSdkVersion:25) +prebuilt_androidx.wear.compose_compose-material-core-nodeps(minSdkVersion:25) +prebuilt_androidx.wear.compose_compose-material-nodeps(minSdkVersion:25) +prebuilt_androidx.wear.compose_compose-navigation-nodeps(minSdkVersion:25) +prebuilt_androidx.wear_wear-nodeps(minSdkVersion:23) +prebuilt_androidx.webkit_webkit-nodeps(minSdkVersion:19) +prebuilt_androidx.window.extensions.core_core-nodeps(minSdkVersion:19) +prebuilt_androidx.window_window-nodeps(minSdkVersion:19) +prebuilt_androidx.work_work-runtime-nodeps(minSdkVersion:19) prebuilt_asm-7.0(minSdkVersion:current) prebuilt_asm-9.2(minSdkVersion:current) prebuilt_asm-commons-7.0(minSdkVersion:current) @@ -1105,7 +1307,7 @@ prebuilt_bionic_libc_platform_headers(minSdkVersion:(no version)) prebuilt_car-ui-lib-nodeps(minSdkVersion:28) prebuilt_car-ui-lib-source(minSdkVersion:28) prebuilt_com.google.android.material_material-nodeps(minSdkVersion:(no version)) -prebuilt_com.google.android.material_material-nodeps(minSdkVersion:14) +prebuilt_com.google.android.material_material-nodeps(minSdkVersion:19) prebuilt_crtbegin_dynamic(minSdkVersion:(no version)) prebuilt_crtbegin_so(minSdkVersion:(no version)) prebuilt_crtend_android(minSdkVersion:(no version)) @@ -1127,6 +1329,8 @@ prebuilt_firebase-messaging-aar(minSdkVersion:14) prebuilt_glide-annotation-and-compiler-prebuilt(minSdkVersion:14) prebuilt_glide-disklrucache-prebuilt(minSdkVersion:14) prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:14) +prebuilt_glide-integration-recyclerview-prebuilt(minSdkVersion:14) +prebuilt_glide-integration-webpdecoder-prebuilt(minSdkVersion:14) prebuilt_glide-prebuilt(minSdkVersion:14) prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:29) prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:current) @@ -1158,6 +1362,7 @@ resourceobserver_aidl_interface-V1-ndk(minSdkVersion:29) resourceobserver_aidl_interface-V1-ndk_platform(minSdkVersion:29) rkpd(minSdkVersion:33) s2-geometry-library-java(minSdkVersion:30) +s2storage_ro(minSdkVersion:31) sap-api-java-static(minSdkVersion:30) server_configurable_flags(minSdkVersion:29) service-entitlement(minSdkVersion:29) @@ -1171,6 +1376,7 @@ SettingsLibActivityEmbedding(minSdkVersion:21) SettingsLibAppPreference(minSdkVersion:21) SettingsLibBarChartPreference(minSdkVersion:21) SettingsLibCollapsingToolbarBaseActivity(minSdkVersion:29) +SettingsLibColor(minSdkVersion:28) SettingsLibFooterPreference(minSdkVersion:21) SettingsLibHelpUtils(minSdkVersion:21) SettingsLibIllustrationPreference(minSdkVersion:28) @@ -1182,6 +1388,7 @@ SettingsLibRadioButtonPreference(minSdkVersion:21) SettingsLibRestrictedLockUtils(minSdkVersion:21) SettingsLibSearchWidget(minSdkVersion:21) SettingsLibSelectorWithWidgetPreference(minSdkVersion:21) +SettingsLibSettingsSpinner(minSdkVersion:21) SettingsLibSettingsTheme(minSdkVersion:21) SettingsLibSettingsTransition(minSdkVersion:29) SettingsLibTopIntroPreference(minSdkVersion:21) @@ -1193,6 +1400,7 @@ statsd-aidl-ndk(minSdkVersion:30) statsd-aidl-ndk_platform(minSdkVersion:(no version)) statsd-aidl-ndk_platform(minSdkVersion:30) statsprotos(minSdkVersion:29) +statsprotos(minSdkVersion:30) tensorflow_headers(minSdkVersion:(no version)) tensorflow_headers(minSdkVersion:apex_inherit) tensorflowlite_java(minSdkVersion:30) @@ -1212,8 +1420,10 @@ tflite_support_libz(minSdkVersion:30) tflite_support_metadata_extractor(minSdkVersion:30) tflite_support_task_core_proto(minSdkVersion:30) tflite_support_tokenizers(minSdkVersion:30) +uwb_androidx_backend(minSdkVersion:30) wifi-lite-protos(minSdkVersion:30) wifi-nano-protos(minSdkVersion:30) wifi-service-pre-jarjar(minSdkVersion:30) +wifi_aconfig_flags_lib(minSdkVersion:30) xz-java(minSdkVersion:29) xz-java(minSdkVersion:current) diff --git a/build/build_unbundled_mainline_module.sh b/build/build_unbundled_mainline_module.sh index 34c8ff7..996ad2f 100755 --- a/build/build_unbundled_mainline_module.sh +++ b/build/build_unbundled_mainline_module.sh @@ -55,7 +55,6 @@ readonly -a DEFAULT_MODULES=( com.android.resolv com.android.runtime com.android.sdkext - com.android.sepolicy # TODO(b/210694291): include tethering module in the build # com.android.tethering com.android.tzdata @@ -133,6 +132,7 @@ function build_modules() { MODULE_BUILD_FROM_SOURCE=true \ ${extra_build_params} \ "${RUN_ERROR_PRONE:+"RUN_ERROR_PRONE=true"}" \ + "${CHECK_API:+"checkapi"}" \ apps_only \ dist \ lint-check diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index b52b85a..d4cc56b 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -322,6 +322,9 @@ class SnapshotBuilder: # The out/soong/mainline-sdks directory. mainline_sdks_dir: str = "" + # True if apex-allowed-deps-check is to be skipped. + skip_allowed_deps_check: bool = False + def __post_init__(self): self.mainline_sdks_dir = os.path.join(self.out_dir, "soong/mainline-sdks") @@ -356,8 +359,9 @@ class SnapshotBuilder: f"TARGET_BUILD_VARIANT={target_build_variant}", "TARGET_PRODUCT=mainline_sdk", "MODULE_BUILD_FROM_SOURCE=true", - "out/soong/apex/depsinfo/new-allowed-deps.txt.check", ] + target_paths + if not self.skip_allowed_deps_check: + cmd += ["apex-allowed-deps-check"] print_command(extraEnv, cmd) env = os.environ.copy() env.update(extraEnv) @@ -472,7 +476,8 @@ java_sdk_library_import {{ @staticmethod def does_sdk_library_support_latest_api(sdk_library): - if sdk_library == "conscrypt.module.platform.api": + if sdk_library == "conscrypt.module.platform.api" or \ + sdk_library == "conscrypt.module.intra.core.api": return False return True @@ -503,6 +508,10 @@ java_sdk_library_import {{ target_dict[sdk_library][scope][target] = scope_json[target] target_paths.append(scope_json["latest_api"]) target_paths.append(scope_json["latest_removed_api"]) + target_paths.append(scope_json["latest_api"] + .replace(".latest", ".latest.extension_version")) + target_paths.append(scope_json["latest_removed_api"] + .replace(".latest", ".latest.extension_version")) return target_paths, target_dict @@ -560,6 +569,7 @@ java_sdk_library_import {{ with open( sdk_api_diff_file, "w", encoding="utf8") as sdk_api_diff_file_object: + last_finalized_version_set = set() for sdk_library in target_dict[sdk_info_file]: for scope in target_dict[sdk_info_file][sdk_library]: scope_json = target_dict[sdk_info_file][sdk_library][scope] @@ -575,6 +585,33 @@ java_sdk_library_import {{ sdk_zip_file, removed_api, latest_removed_api, snapshots_dir) + def read_extension_version(target): + extension_target = target.replace( + ".latest", ".latest.extension_version") + with open( + extension_target, "r", encoding="utf8") as file: + version = int(file.read()) + # version equal to -1 means "not an extension version". + if version != -1: + last_finalized_version_set.add(version) + + read_extension_version(scope_json["latest_api"]) + read_extension_version(scope_json["latest_removed_api"]) + + if len(last_finalized_version_set) == 0: + # Either there is no java sdk library or all java sdk libraries + # have not been finalized in sdk extensions yet and hence have + # last finalized version set as -1. + gantry_metadata_dict["last_finalized_version"] = -1 + elif len(last_finalized_version_set) == 1: + # All java sdk library extension version match. + gantry_metadata_dict["last_finalized_version"] =\ + last_finalized_version_set.pop() + else: + # Fail the build + raise ValueError( + "Not all sdk libraries finalized with the same version.\n") + gantry_metadata_dict["api_diff_file"] = sdk_api_diff_file.rsplit( "/", 1)[-1] gantry_metadata_dict["api_diff_file_size"] = os.path.getsize( @@ -589,6 +626,9 @@ java_sdk_library_import {{ "w") as gantry_metadata_json_file_object: gantry_metadata_json_file_object.write(gantry_metadata_json_object) + if os.path.getsize(sdk_metadata_json_file) > 1048576: # 1 MB + raise ValueError("Metadata file size should not exceed 1 MB.\n") + def get_module_extension_version(self): return int( subprocess.run([ @@ -668,6 +708,13 @@ class BuildRelease: preferHandling: PreferHandling = \ PreferHandling.USE_SOURCE_CONFIG_VAR_PROPERTY + # Whether the generated snapshots should include flagged APIs. Defaults to + # false because flagged APIs are not suitable for use outside Android. + include_flagged_apis: bool = False + + # Whether the build release should generate Gantry metadata and API diff. + generate_gantry_metadata_and_api_diff: bool = False + def __post_init__(self): # The following use object.__setattr__ as this object is frozen and # attempting to set the fields directly would cause an exception to be @@ -769,6 +816,16 @@ UpsideDownCake = BuildRelease( # Insert additional BuildRelease definitions for following releases here, # before LATEST. +# A build release for the latest build excluding flagged apis. +NEXT = BuildRelease( + name="next", + creator=create_latest_sdk_snapshots, + # There are no build release specific environment variables to pass to + # Soong. + soong_env={}, + generate_gantry_metadata_and_api_diff=True, +) + # The build release for the latest build supported by this build, i.e. the # current build. This must be the last BuildRelease defined in this script. LATEST = BuildRelease( @@ -777,6 +834,10 @@ LATEST = BuildRelease( # There are no build release specific environment variables to pass to # Soong. soong_env={}, + # Latest must include flagged APIs because it may be dropped into the main + # Android branches. + include_flagged_apis=True, + generate_gantry_metadata_and_api_diff=True, ) @@ -882,8 +943,7 @@ class MainlineModule: # If the module is optional then it needs its own Soong config # variable to allow it to be managed separately from other modules. - if (self.last_optional_release and - self.last_optional_release > build_release): + if self.last_optional_release: config_var = ConfigVar( namespace=f"{self.short_name}_module", name="source_build", @@ -986,6 +1046,14 @@ MAINLINE_MODULES = [ # appear to generate a snapshot for it. for_r_build=None, ), + MainlineModule( + apex="com.android.devicelock", + sdks=["devicelock-module-sdk"], + first_release=UpsideDownCake, + # Treat DeviceLock as optional at build time + # TODO(b/238203992): remove once all modules are optional at build time. + last_optional_release=LATEST, + ), MainlineModule( apex="com.android.healthfitness", sdks=["healthfitness-module-sdk"], @@ -1017,6 +1085,10 @@ MAINLINE_MODULES = [ for_r_build=ForRBuild(sdk_libraries=[ SdkLibrary(name="framework-mediaprovider"), ]), + # MP is a mandatory mainline module but in some cases (b/294190883) this + # needs to be optional for Android Go on T. GTS tests might be needed to + # to check the specific condition mentioned in the bug. + last_optional_release=LATEST, ), MainlineModule( apex="com.android.ondevicepersonalization", @@ -1210,7 +1282,7 @@ class SdkDistProducer: modules = [m for m in modules if not m.is_bundled()] snapshots_dir = self.snapshot_builder.build_snapshots( build_release, modules) - if build_release == LATEST: + if build_release.generate_gantry_metadata_and_api_diff: target_dict = self.snapshot_builder.build_sdk_scope_targets( build_release, modules) self.snapshot_builder.build_snapshot_gantry_metadata_and_api_diff( @@ -1245,13 +1317,21 @@ class SdkDistProducer: shutil.copy(sdk_gantry_metadata_json_path, sdk_dist_gantry_metadata_json_path) + def dist_generate_sdk_supported_modules_file(self, modules): + sdk_modules_file = os.path.join(self.dist_dir, "sdk-modules.txt") + os.makedirs(os.path.dirname(sdk_modules_file), exist_ok=True) + with open(sdk_modules_file, "w", encoding="utf8") as file: + for module in modules: + if module in MAINLINE_MODULES: + file.write(aosp_to_google_name(module.apex) + "\n") + def populate_unbundled_dist(self, build_release, modules, snapshots_dir): build_release_dist_dir = os.path.join(self.mainline_sdks_dir, build_release.sub_dir) for module in modules: for sdk in module.sdks: sdk_dist_dir = os.path.join(build_release_dist_dir, SDK_VERSION) - if build_release == LATEST: + if build_release.generate_gantry_metadata_and_api_diff: self.dist_sdk_snapshot_gantry_metadata_and_api_diff( sdk_dist_dir, sdk, module, snapshots_dir) self.populate_dist_snapshot(build_release, module, sdk, @@ -1378,7 +1458,7 @@ def apply_transformations(producer, tmp_dir, transformations, build_release): os.utime(path, (modified, modified)) -def create_producer(tool_path): +def create_producer(tool_path, skip_allowed_deps_check): # Variables initialized from environment variables that are set by the # calling mainline_modules_sdks.sh. out_dir = os.environ["OUT_DIR"] @@ -1393,6 +1473,7 @@ def create_producer(tool_path): tool_path=tool_path, subprocess_runner=subprocess_runner, out_dir=out_dir, + skip_allowed_deps_check=skip_allowed_deps_check, ) return SdkDistProducer( subprocess_runner=subprocess_runner, @@ -1488,6 +1569,11 @@ def main(args): "Defaults to true when TARGET_BUILD_APPS is not set. " "Applicable only if the \"latest\" build release is built.", ) + args_parser.add_argument( + "--skip-allowed-deps-check", + action="store_true", + help="Skip apex-allowed-deps-check.", + ) args = args_parser.parse_args(args) build_releases = ALL_BUILD_RELEASES @@ -1507,7 +1593,8 @@ def main(args): if not target_build_apps or args.build_platform_sdks_for_mainline: modules += PLATFORM_SDKS_FOR_MAINLINE - producer = create_producer(args.tool_path) + producer = create_producer(args.tool_path, args.skip_allowed_deps_check) + producer.dist_generate_sdk_supported_modules_file(modules) producer.produce_dist(modules, build_releases) diff --git a/build/mainline_modules_sdks.sh b/build/mainline_modules_sdks.sh index 35a677e..66dd931 100755 --- a/build/mainline_modules_sdks.sh +++ b/build/mainline_modules_sdks.sh @@ -50,7 +50,8 @@ function main() { # Building with --soong-only and module products requires build_number.txt for # some targets. - echo -n "${BUILD_NUMBER}" > "${OUT_DIR}"/soong/build_number.txt + # Command to populate {OUT_DIR}/soong/build_number.txt. + build/soong/soong_ui.bash --make-mode nothing # Delegate the SDK generation to the python script. Use the python version # provided by the build to ensure consistency across build environments. diff --git a/build/mainline_modules_sdks_test.py b/build/mainline_modules_sdks_test.py index 2131a60..ba4421d 100644 --- a/build/mainline_modules_sdks_test.py +++ b/build/mainline_modules_sdks_test.py @@ -130,7 +130,11 @@ class FakeSnapshotBuilder(mm.SnapshotBuilder): for target_path in target_paths: os.makedirs(os.path.split(target_path)[0]) - self.write_data_to_file(target_path, "") + if ".latest.extension_version" in target_path: + self.write_data_to_file( + target_path, str(self.get_module_extension_version())) + else: + self.write_data_to_file(target_path, "") return target_dict @@ -343,6 +347,11 @@ class TestProduceDist(unittest.TestCase): 5, msg="The module extension version does not match the expected value." ) + self.assertEqual( + json_data["last_finalized_version"], + 5, + msg="The last finalized version does not match the expected value." + ) def create_build_number_file(self): soong_dir = os.path.join(self.tmp_out_dir, "soong") @@ -410,6 +419,84 @@ class TestProduceDist(unittest.TestCase): ), ], snapshot_builder.snapshots) + def test_generate_sdk_supported_modules_file(self): + subprocess_runner = mm.SubprocessRunner() + snapshot_builder = FakeSnapshotBuilder( + tool_path="path/to/mainline_modules_sdks.sh", + subprocess_runner=subprocess_runner, + out_dir=self.tmp_out_dir, + ) + producer = mm.SdkDistProducer( + subprocess_runner=subprocess_runner, + snapshot_builder=snapshot_builder, + dist_dir=self.tmp_dist_dir, + ) + producer = mm.SdkDistProducer( + subprocess_runner=subprocess_runner, + snapshot_builder=snapshot_builder, + dist_dir=self.tmp_dist_dir, + ) + + # Contains only sdk modules. + modules = [ + MAINLINE_MODULES_BY_APEX["com.android.adservices"], + MAINLINE_MODULES_BY_APEX["com.android.art"], + MAINLINE_MODULES_BY_APEX["com.android.mediaprovider"], + ] + producer.dist_generate_sdk_supported_modules_file(modules) + with open(os.path.join(self.tmp_dist_dir, "sdk-modules.txt"), "r", + encoding="utf8") as sdk_modules_file: + sdk_modules = sdk_modules_file.readlines() + + self.assertTrue("com.google.android.adservices\n" in sdk_modules) + self.assertTrue("com.google.android.art\n" in sdk_modules) + self.assertTrue("com.google.android.mediaprovider\n" in sdk_modules) + + # Contains only non-sdk modules. + modules = [ + mm.MainlineModule( + apex="com.android.adbd", + sdks=[], + first_release="", + ), + mm.MainlineModule( + apex="com.android.adbd", + sdks=[], + first_release="", + ), + ] + producer.dist_generate_sdk_supported_modules_file(modules) + with open(os.path.join(self.tmp_dist_dir, "sdk-modules.txt"), "r", + encoding="utf8") as sdk_modules_file: + sdk_modules = sdk_modules_file.readlines() + + self.assertEqual(len(sdk_modules), 0) + + # Contains mixture of sdk and non-sdk modules. + modules = [ + MAINLINE_MODULES_BY_APEX["com.android.adservices"], + MAINLINE_MODULES_BY_APEX["com.android.mediaprovider"], + mm.MainlineModule( + apex="com.android.adbd", + sdks=[], + first_release="", + ), + mm.MainlineModule( + apex="com.android.adbd", + sdks=[], + first_release="", + ), + ] + producer.dist_generate_sdk_supported_modules_file(modules) + with open(os.path.join(self.tmp_dist_dir, "sdk-modules.txt"), "r", + encoding="utf8") as sdk_modules_file: + sdk_modules = sdk_modules_file.readlines() + + self.assertTrue("com.google.android.adservices\n" in sdk_modules) + self.assertTrue("com.google.android.mediaprovider\n" in sdk_modules) + self.assertFalse("com.google.android.adbd\n" in sdk_modules) + self.assertFalse("com.google.android.extservices\n" in sdk_modules) + def path_to_test_data(relative_path): """Construct a path to a test data file. @@ -520,6 +607,21 @@ class TestAndroidBpTransformations(unittest.TestCase): self.apply_transformations(src, transformations, mm.Tiramisu, expected) + def test_optional_mainline_module_latest(self): + """Tests the transformations applied to an optional mainline sdk LATEST. + + This uses wifi as an example of a optional mainline sdk. This checks + that the use_source_config_var property is inserted. + """ + src = read_test_data("wifi_Android.bp.input") + + expected = read_test_data("wifi_latest_Android.bp.expected") + + module = MAINLINE_MODULES_BY_APEX["com.android.wifi"] + transformations = module.transformations(mm.LATEST, mm.Sdk) + + self.apply_transformations(src, transformations, mm.LATEST, expected) + def test_art(self): """Tests the transformations applied to a the ART mainline module. diff --git a/build/mainline_modules_sdks_test_data/wifi_latest_Android.bp.expected b/build/mainline_modules_sdks_test_data/wifi_latest_Android.bp.expected new file mode 100644 index 0000000..51d700e --- /dev/null +++ b/build/mainline_modules_sdks_test_data/wifi_latest_Android.bp.expected @@ -0,0 +1,124 @@ +// This is auto-generated. DO NOT EDIT. + +package { + // A default list here prevents the license LSC from adding its own list which would + // be unnecessary as every module in the sdk already has its own licenses property. + default_applicable_licenses: ["Android-Apache-2.0"], +} + +prebuilt_bootclasspath_fragment { + name: "com.android.wifi-bootclasspath-fragment", + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. + use_source_config_var: { + config_namespace: "wifi_module", + var_name: "source_build", + }, + visibility: ["//visibility:public"], + apex_available: ["com.android.wifi"], + licenses: ["wifi-module-sdk_Android-Apache-2.0"], + contents: ["framework-wifi"], + fragments: [ + { + apex: "com.android.art", + module: "art-bootclasspath-fragment", + }, + ], + hidden_api: { + unsupported: ["hiddenapi/hiddenapi-unsupported.txt"], + max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"], + max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"], + annotation_flags: "hiddenapi/annotation-flags.csv", + metadata: "hiddenapi/metadata.csv", + index: "hiddenapi/index.csv", + signature_patterns: "hiddenapi/signature-patterns.csv", + filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", + filtered_flags: "hiddenapi/filtered-flags.csv", + }, +} + +java_sdk_library_import { + name: "framework-wifi", + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. + use_source_config_var: { + config_namespace: "wifi_module", + var_name: "source_build", + }, + visibility: ["//visibility:public"], + apex_available: [ + "com.android.wifi", + "test_com.android.wifi", + ], + licenses: ["wifi-module-sdk_Android-Apache-2.0"], + shared_library: false, + permitted_packages: [ + "android.hardware.wifi", + "android.net.wifi", + "com.android.wifi.x", + ], + public: { + jars: ["sdk_library/public/framework-wifi-stubs.jar"], + stub_srcs: ["sdk_library/public/framework-wifi_stub_sources"], + current_api: "sdk_library/public/framework-wifi.txt", + removed_api: "sdk_library/public/framework-wifi-removed.txt", + annotations: "sdk_library/public/framework-wifi_annotations.zip", + sdk_version: "module_current", + }, + system: { + jars: ["sdk_library/system/framework-wifi-stubs.jar"], + stub_srcs: ["sdk_library/system/framework-wifi_stub_sources"], + current_api: "sdk_library/system/framework-wifi.txt", + removed_api: "sdk_library/system/framework-wifi-removed.txt", + annotations: "sdk_library/system/framework-wifi_annotations.zip", + sdk_version: "module_current", + }, + module_lib: { + jars: ["sdk_library/module-lib/framework-wifi-stubs.jar"], + stub_srcs: ["sdk_library/module-lib/framework-wifi_stub_sources"], + current_api: "sdk_library/module-lib/framework-wifi.txt", + removed_api: "sdk_library/module-lib/framework-wifi-removed.txt", + annotations: "sdk_library/module-lib/framework-wifi_annotations.zip", + sdk_version: "module_current", + }, +} + +java_import { + name: "service-wifi", + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. + use_source_config_var: { + config_namespace: "wifi_module", + var_name: "source_build", + }, + visibility: [ + "//frameworks/opt/net/wifi/service/apex", + "//frameworks/opt/net/wifi/tests/wifitests/apex", + "//packages/modules/Wifi/apex", + "//packages/modules/Wifi/service", + "//packages/modules/Wifi/service/tests/wifitests/apex", + ], + apex_available: [ + "com.android.wifi", + "test_com.android.wifi", + ], + licenses: ["wifi-module-sdk_Android-Apache-2.0"], + jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-wifi.jar"], +} + +license { + name: "wifi-module-sdk_Android-Apache-2.0", + visibility: ["//visibility:private"], + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["licenses/build/soong/licenses/LICENSE"], +} + +prebuilt_systemserverclasspath_fragment { + name: "com.android.wifi-systemserverclasspath-fragment", + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. + use_source_config_var: { + config_namespace: "wifi_module", + var_name: "source_build", + }, + visibility: ["//visibility:public"], + apex_available: ["com.android.wifi"], + licenses: ["wifi-module-sdk_Android-Apache-2.0"], + standalone_contents: ["service-wifi"], +} diff --git a/java/com/android/modules/targetprep/ClasspathFetcher.java b/java/com/android/modules/targetprep/ClasspathFetcher.java index 7838343..f779671 100644 --- a/java/com/android/modules/targetprep/ClasspathFetcher.java +++ b/java/com/android/modules/targetprep/ClasspathFetcher.java @@ -46,7 +46,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; -import org.jf.dexlib2.iface.ClassDef; +import com.android.tools.smali.dexlib2.iface.ClassDef; /* * Target preparer that fetches classpath relevant artifacts for a test in a 'reentrant' manner. diff --git a/javatests/com/android/modules/apkinapex/Android.bp b/javatests/com/android/modules/apkinapex/Android.bp index ee16fd6..661a1df 100644 --- a/javatests/com/android/modules/apkinapex/Android.bp +++ b/javatests/com/android/modules/apkinapex/Android.bp @@ -21,7 +21,7 @@ package { java_test_host { name: "ApkInApexTest", srcs: [ - "ApkInApexTest.java" + "ApkInApexTest.java", ], libs: ["tradefed"], java_resources: [ @@ -32,7 +32,7 @@ java_test_host { "cts-install-lib-host", "frameworks-base-hostutils", "modules-utils-build-testing", - "truth-prebuilt", + "truth", ], test_suites: [ "general-tests", diff --git a/javatests/com/android/modules/apkinapex/apex/Android.bp b/javatests/com/android/modules/apkinapex/apex/Android.bp index c57280e..44bea56 100644 --- a/javatests/com/android/modules/apkinapex/apex/Android.bp +++ b/javatests/com/android/modules/apkinapex/apex/Android.bp @@ -34,6 +34,7 @@ apex_test { key: "test_com.android.modules.apkinapex.key", certificate: ":test_com.android.modules.apkinapex.certificate", updatable: false, + min_sdk_version: "33", apps: [ "com.android.modules.apkinapex.apps.installable", "com.android.modules.apkinapex.apps.futureminsdk", diff --git a/javatests/com/android/modules/apkinapex/apps/Android.bp b/javatests/com/android/modules/apkinapex/apps/Android.bp index 04b56f2..0300955 100644 --- a/javatests/com/android/modules/apkinapex/apps/Android.bp +++ b/javatests/com/android/modules/apkinapex/apps/Android.bp @@ -29,6 +29,7 @@ android_test_helper_app { android_test_helper_app { name: "com.android.modules.apkinapex.apps.futuretargetsdk", + min_sdk_version: "33", target_sdk_version: "Tiramisu", apex_available: [ "test_com.android.modules.apkinapex" ], manifest: "FutureTargetSdkAndroidManifest.xml" @@ -36,6 +37,7 @@ android_test_helper_app { android_test_helper_app { name: "com.android.modules.apkinapex.apps.pastmaxsdk", + min_sdk_version: "29", target_sdk_version: "Tiramisu", apex_available: [ "test_com.android.modules.apkinapex" ], manifest: "PastMaxSdkAndroidManifest.xml" diff --git a/javatests/com/android/modules/conformanceframework/Android.bp b/javatests/com/android/modules/conformanceframework/Android.bp index 60ad0d1..287daa6 100644 --- a/javatests/com/android/modules/conformanceframework/Android.bp +++ b/javatests/com/android/modules/conformanceframework/Android.bp @@ -24,7 +24,7 @@ java_test_host { static_libs: [ "junit", "ClasspathFetcher", - "truth-prebuilt", + "truth", "objenesis", ], libs: [ diff --git a/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java b/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java index f10cc52..b974c14 100644 --- a/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java +++ b/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java @@ -28,6 +28,7 @@ import com.android.modules.proto.ClasspathClasses.ClasspathEntry; import com.android.modules.proto.ClasspathClasses.Jar; import com.android.modules.targetprep.ClasspathFetcher; import com.android.modules.utils.build.testing.DeviceSdkLevel; +import com.android.tools.smali.dexlib2.iface.ClassDef; import com.android.tradefed.config.Option; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; @@ -47,7 +48,6 @@ import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import org.jf.dexlib2.iface.ClassDef; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/com/android/modules/targetprep/Android.bp b/javatests/com/android/modules/targetprep/Android.bp index baa0219..1dd8915 100644 --- a/javatests/com/android/modules/targetprep/Android.bp +++ b/javatests/com/android/modules/targetprep/Android.bp @@ -24,13 +24,13 @@ java_test_host { unit_test: true, }, srcs: [ - "ClasspathFetcherTest.java" + "ClasspathFetcherTest.java", ], static_libs: [ "ClasspathFetcher", "mockito-host", "objenesis", - "truth-prebuilt", + "truth", "junit", "tradefed", ], diff --git a/javatests/com/android/modules/updatablesharedlibs/Android.bp b/javatests/com/android/modules/updatablesharedlibs/Android.bp index f469f95..9813dc8 100644 --- a/javatests/com/android/modules/updatablesharedlibs/Android.bp +++ b/javatests/com/android/modules/updatablesharedlibs/Android.bp @@ -21,7 +21,7 @@ package { java_test_host { name: "UpdatableSharedLibsTest", srcs: [ - "UpdatableSharedLibsTest.java" + "UpdatableSharedLibsTest.java", ], libs: ["tradefed"], java_resources: [ @@ -37,10 +37,10 @@ java_test_host { "cts-install-lib-host", "frameworks-base-hostutils", "modules-utils-build-testing", - "truth-prebuilt", + "truth", ], test_suites: [ "general-tests", - "mts-core", + "mts-mainline-infra", ], } diff --git a/javatests/com/android/modules/updatablesharedlibs/apex/Android.bp b/javatests/com/android/modules/updatablesharedlibs/apex/Android.bp index db56f35..b063489 100644 --- a/javatests/com/android/modules/updatablesharedlibs/apex/Android.bp +++ b/javatests/com/android/modules/updatablesharedlibs/apex/Android.bp @@ -37,4 +37,5 @@ apex_test { "com.android.modules.updatablesharedlibs.libs.since.t", ], updatable: false, + min_sdk_version: "33", } diff --git a/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp b/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp index c714267..58dc54b 100644 --- a/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp +++ b/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp @@ -23,7 +23,7 @@ android_test_helper_app { static_libs: [ "androidx.test.rules", "androidx.test.core", - "truth-prebuilt", + "truth", ], sdk_version: "current", min_sdk_version: "31", diff --git a/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp b/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp index 2649a95..90c1230 100644 --- a/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp +++ b/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp @@ -22,7 +22,7 @@ android_test_helper_app { static_libs: [ "androidx.test.rules", "androidx.test.core", - "truth-prebuilt", + "truth", ], sdk_version: "current", min_sdk_version: "Tiramisu", diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp index 9ffce3a..59d8237 100644 --- a/sdk/ModuleDefaults.bp +++ b/sdk/ModuleDefaults.bp @@ -17,39 +17,6 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -mainline_stubs_args = - "--error UnhiddenSystemApi " + - "--hide CallbackInterface " + - "--hide HiddenTypedefConstant " + - "--hide RequiresPermission " + - "--enhance-documentation " - -// TODO: remove the hiding when server classes are cleaned up. -mainline_framework_stubs_args = - mainline_stubs_args + - "--hide-package com.android.server " - -priv_apps = " " + - "--show-annotation android.annotation.SystemApi\\(" + - "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + - "\\) " - -module_libs = " " + - " --show-annotation android.annotation.SystemApi\\(" + - "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" + - "\\)" + - " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" + - "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + - "\\) " - -mainline_service_stubs_args = - mainline_stubs_args + - "--show-annotation android.annotation.SystemApi\\(" + - "client=android.annotation.SystemApi.Client.SYSTEM_SERVER" + - "\\) " + - "--hide-annotation android.annotation.Hide " + - "--hide InternalClasses " // com.android.* classes are okay in this interface - // Defaults common to all mainline module java_sdk_library instances. java_defaults { name: "framework-module-common-defaults", @@ -78,6 +45,7 @@ java_defaults { // TODO(b/156126315) - Remove when no longer needed. api_lint: { enabled: true, + legacy_errors_allowed: false, }, // The API scope specific properties. @@ -91,7 +59,12 @@ java_defaults { installable: false, // Configure framework module specific metalava options. - droiddoc_options: [mainline_stubs_args], + droiddoc_options: [ + "--error UnhiddenSystemApi", + "--error UnflaggedApi", + "--hide CallbackInterface", + "--enhance-documentation", + ], annotations_enabled: true, @@ -133,6 +106,8 @@ java_defaults { }, defaults_visibility: [ + "//frameworks/base", + "//frameworks/base/api", "//packages/modules/Virtualization:__subpackages__", ], } @@ -159,6 +134,8 @@ java_defaults { defaults_visibility: [ ":__subpackages__", + // TODO(b/237461653): Move this to packages/modules/Nfc + "//frameworks/base/core/java", "//frameworks/base/apex:__subpackages__", "//frameworks/base/libs/hwui", "//frameworks/base/wifi", @@ -193,40 +170,6 @@ java_defaults { ], } -stubs_defaults { - name: "service-module-stubs-srcs-defaults", - args: mainline_service_stubs_args, - installable: false, - annotations_enabled: true, - merge_annotations_dirs: [ - "metalava-manual", - ], - filter_packages: ["com.android."], - check_api: { - current: { - api_file: "api/current.txt", - removed_api_file: "api/removed.txt", - }, - api_lint: { - enabled: true, - }, - }, - dist: { - targets: ["sdk"], - dir: "apistubs/android/system-server/api", - }, -} - -// Empty for now, but a convenient place to add rules for all -// module java_library system_server stub libs. -java_defaults { - name: "service-module-stubs-defaults", - dist: { - targets: ["sdk"], - dir: "apistubs/android/system-server", - }, -} - filegroup_defaults { name: "framework-sources-module-defaults", visibility: [ @@ -239,7 +182,7 @@ filegroup_defaults { // These apex_defaults serve as a common place to add properties which should // affect all mainline modules. -APEX_LOWEST_MIN_SDK_VERSION = "29" +APEX_LOWEST_MIN_SDK_VERSION = "30" DCLA_MIN_SDK_VERSION = "31" apex_defaults { @@ -251,7 +194,7 @@ apex_defaults { apex_defaults { name: "q-launched-apex-module", defaults: ["any-launched-apex-modules"], - min_sdk_version: "29", + min_sdk_version: APEX_LOWEST_MIN_SDK_VERSION, defaults_visibility: ["//visibility:public"], } @@ -313,7 +256,6 @@ apex_defaults { name: "s-launched-apex-module", defaults: ["any-launched-apex-modules"], min_sdk_version: "31", - updatable: true, // Indicates that pre-installed version of this apex can be compressed. // Whether it actually will be compressed is controlled on per-device basis. compressible:true, @@ -333,7 +275,6 @@ apex_defaults { defaults_visibility: ["//packages/modules:__subpackages__"], } - apex_defaults { name: "u-launched-apex-module", defaults: ["any-launched-apex-modules"], @@ -344,10 +285,20 @@ apex_defaults { defaults_visibility: ["//packages/modules:__subpackages__"], } +apex_defaults { + name: "v-launched-apex-module", + defaults: ["any-launched-apex-modules"], + min_sdk_version: "VanillaIceCream", + // Indicates that pre-installed version of this apex can be compressed. + // Whether it actually will be compressed is controlled on per-device basis. + compressible: true, + defaults_visibility: ["//packages/modules:__subpackages__"], +} + library_linking_strategy_cc_defaults { name: "apex-lowest-min-sdk-version", defaults_visibility: [ - "//system/core/libutils", + "//system/core/libutils:__subpackages__", ], min_sdk_version: APEX_LOWEST_MIN_SDK_VERSION, soong_config_variables: { diff --git a/tools/finalize_sdk.py b/tools/finalize_sdk.py index a468025..30c43a3 100755 --- a/tools/finalize_sdk.py +++ b/tools/finalize_sdk.py @@ -23,9 +23,9 @@ BUILD_TARGET_TRAIN = 'train_build' # This build target is used when fetching from a non-train build (XXXXXXXX) BUILD_TARGET_CONTINUOUS = 'mainline_modules_sdks-userdebug' # The glob of sdk artifacts to fetch from remote build -ARTIFACT_PATTERN = 'mainline-sdks/for-latest-build/current/{module_name}/sdk/*.zip' +ARTIFACT_PATTERN = 'mainline-sdks/for-next-build/current/{module_name}/sdk/*.zip' # The glob of sdk artifacts to fetch from local build -ARTIFACT_LOCAL_PATTERN = 'out/dist/mainline-sdks/for-latest-build/current/{module_name}/sdk/*.zip' +ARTIFACT_LOCAL_PATTERN = 'out/dist/mainline-sdks/for-next-build/current/{module_name}/sdk/*.zip' COMMIT_TEMPLATE = """Finalize artifacts for extension SDK %d Import from build id %s.