From 39910c5885902aa21839894324fcd4f3996a7721 Mon Sep 17 00:00:00 2001 From: Anvesh Renikindi Date: Mon, 18 Dec 2023 17:01:26 +0000 Subject: updated minsdk bump to 19 Change-Id: I8437b49257e883c29cf7536ba27997608263383e Merged-In: Ieb36f7b5e93d0f2b060dee244f2d66d2d20ba7c1 Bug: 306486752 Test: Prebuilts Aosp-First: No Apex-Size-Increase: Previous-Platform-Support: yes Test-Info:Android JUnit Test ignore-AOSP-First: Merge conflict resolution --- build/allowed_deps.txt | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 6c23449c..c39366f6 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -207,15 +207,11 @@ androidx.recyclerview_recyclerview-selection(minSdkVersion:19) androidx.resourceinspection_resourceinspection-annotation(minSdkVersion:24) androidx.room_room-common(minSdkVersion:24) androidx.room_room-ktx(minSdkVersion:19) -androidx.room_room-ktx(minSdkVersion:19) -androidx.room_room-runtime(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(minSdkVersion:19) -androidx.sqlite_sqlite-framework(minSdkVersion:19) androidx.sqlite_sqlite-framework(minSdkVersion:19) androidx.startup_startup-runtime(minSdkVersion:19) androidx.swiperefreshlayout_swiperefreshlayout(minSdkVersion:19) @@ -230,7 +226,6 @@ androidx.webkit_webkit(minSdkVersion:19) androidx.window.extensions.core_core(minSdkVersion:19) androidx.window_window(minSdkVersion:19) androidx.work_work-runtime(minSdkVersion:19) -androidx.work_work-runtime(minSdkVersion:19) apache-commons-compress(minSdkVersion:29) apache-commons-compress(minSdkVersion:current) apache-commons-io(minSdkVersion:33) @@ -1181,8 +1176,6 @@ 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:19) -prebuilt_androidx.room_room-ktx-nodeps(minSdkVersion:19) -prebuilt_androidx.room_room-runtime-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)) @@ -1190,8 +1183,6 @@ prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:19) prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:(no version)) prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:19) prebuilt_androidx.sqlite_sqlite-framework-nodeps(minSdkVersion:19) -prebuilt_androidx.sqlite_sqlite-framework-nodeps(minSdkVersion:19) -prebuilt_androidx.sqlite_sqlite-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)) @@ -1212,7 +1203,6 @@ 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_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) @@ -1242,12 +1232,12 @@ prebuilt_firebase-installations-aar(minSdkVersion:19) prebuilt_firebase-installations-interop-aar(minSdkVersion:19) prebuilt_firebase-measurement-connector-aar(minSdkVersion:19) prebuilt_firebase-messaging-aar(minSdkVersion:19) -prebuilt_glide-annotation-and-compiler-prebuilt(minSdkVersion:19) -prebuilt_glide-disklrucache-prebuilt(minSdkVersion:19) -prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:19) -prebuilt_glide-integration-recyclerview-prebuilt(minSdkVersion:19) -prebuilt_glide-integration-webpdecoder-prebuilt(minSdkVersion:19) -prebuilt_glide-prebuilt(minSdkVersion:19) +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) prebuilt_jni_headers(minSdkVersion:(no version)) -- cgit v1.2.3 From 59aae07eaa90762a29d6da17f6920c67dc70ca40 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Wed, 20 Dec 2023 18:02:59 +0800 Subject: [AF02.2] Add modules-utils-binary-xml in allowed_deps.txt Test: m Bug: 313841499 Change-Id: I02868ebe651ef313b72a3a67b786eff9fe3f69ba --- build/allowed_deps.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 27889be6..d34f7735 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -882,6 +882,7 @@ mobile-data-download-populator-java-proto-lite(minSdkVersion:30) mobile_data_downloader_lib(minSdkVersion:30) modules-utils-backgroundthread(minSdkVersion:29) modules-utils-binary-xml(minSdkVersion:29) +modules-utils-binary-xml(minSdkVersion:31) modules-utils-build(minSdkVersion:29) modules-utils-build_system(minSdkVersion:29) modules-utils-bytesmatcher(minSdkVersion:29) -- cgit v1.2.3 From 0837f63bfbfff993ef85ea5800ba23ce94eff9d7 Mon Sep 17 00:00:00 2001 From: Jag Date: Thu, 21 Dec 2023 21:57:40 +0000 Subject: Add inidividual modules as its own optional module. Bug: 238203992 Test: packages/modules/common/build/mainline_modules_sdks.sh Result: udc-mainline-prod/out/dist/mainline-sdks/for-latest-build/current$ for i in `ls */**/*.zip`; do echo "---- $i ----"; unzip -p $i Android.bp | cat | grep -A3 -i 'use_source_config_var' | sort | uniq -c; done ---- com.android.adservices/sdk/adservices-module-sdk-current.zip ---- 6 }, 5 -- 6 config_namespace: "adservices_module", 6 use_source_config_var: { 6 var_name: "source_build", ---- com.android.appsearch/sdk/appsearch-sdk-current.zip ---- 4 }, 3 -- 4 config_namespace: "appsearch_module", 4 use_source_config_var: { 4 var_name: "source_build", ---- com.android.art/host-exports/art-module-host-exports-current.zip ---- 10 }, 9 -- 10 config_namespace: "art_module", 10 use_source_config_var: { 10 var_name: "source_build", ---- com.android.art/sdk/art-module-sdk-current.zip ---- 37 }, 36 -- 37 config_namespace: "art_module", 37 use_source_config_var: { 37 var_name: "source_build", ---- com.android.art/test-exports/art-module-test-exports-current.zip ---- 18 }, 17 -- 18 config_namespace: "art_module", 18 use_source_config_var: { 18 var_name: "source_build", ---- com.android.btservices/sdk/btservices-module-sdk-current.zip ---- 7 }, 6 -- 7 config_namespace: "btservices_module", 7 use_source_config_var: { 7 var_name: "source_build", ---- com.android.configinfrastructure/sdk/configinfrastructure-sdk-current.zip ---- 4 }, 3 -- 4 config_namespace: "configinfrastructure_module", 4 use_source_config_var: { 4 var_name: "source_build", ---- com.android.conscrypt/host-exports/conscrypt-module-host-exports-current.zip ---- 2 }, 1 -- 2 config_namespace: "conscrypt_module", 2 use_source_config_var: { 2 var_name: "source_build", ---- com.android.conscrypt/sdk/conscrypt-module-sdk-current.zip ---- 6 }, 5 -- 6 config_namespace: "conscrypt_module", 6 use_source_config_var: { 6 var_name: "source_build", ---- com.android.conscrypt/test-exports/conscrypt-module-test-exports-current.zip ---- 3 }, 2 -- 3 config_namespace: "conscrypt_module", 3 use_source_config_var: { 3 var_name: "source_build", ---- com.android.healthfitness/sdk/healthfitness-module-sdk-current.zip ---- 4 }, 3 -- 4 config_namespace: "healthfitness_module", 4 use_source_config_var: { 4 var_name: "source_build", ---- com.android.ipsec/sdk/ipsec-module-sdk-current.zip ---- 2 }, 1 -- 2 config_namespace: "ipsec_module", 2 use_source_config_var: { 2 var_name: "source_build", ---- com.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip ---- 3 }, 2 -- 3 config_namespace: "mediaprovider_module", 3 use_source_config_var: { 3 var_name: "source_build", ---- com.android.media/sdk/media-module-sdk-current.zip ---- 5 }, 4 -- 5 config_namespace: "media_module", 5 use_source_config_var: { 5 var_name: "source_build", ---- com.android.ondevicepersonalization/sdk/ondevicepersonalization-module-sdk-current.zip ---- 4 }, 3 -- 4 config_namespace: "ondevicepersonalization_module", 4 use_source_config_var: { 4 var_name: "source_build", ---- com.android.os.statsd/sdk/statsd-module-sdk-current.zip ---- 6 }, 5 -- 6 config_namespace: "statsd_module", 6 use_source_config_var: { 6 var_name: "source_build", ---- com.android.permission/sdk/permission-module-sdk-current.zip ---- 5 }, 4 -- 5 config_namespace: "permission_module", 5 use_source_config_var: { 5 var_name: "source_build", ---- com.android.rkpd/sdk/rkpd-sdk-current.zip ---- 2 }, 1 -- 2 config_namespace: "rkpd_module", 2 use_source_config_var: { 2 var_name: "source_build", ---- com.android.scheduling/sdk/scheduling-sdk-current.zip ---- 4 }, 3 -- 4 config_namespace: "scheduling_module", 4 use_source_config_var: { 4 var_name: "source_build", ---- com.android.sdkext/sdk/sdkextensions-sdk-current.zip ---- 2 }, 1 -- 2 config_namespace: "sdkext_module", 2 use_source_config_var: { 2 var_name: "source_build", ---- com.android.tethering/sdk/tethering-module-sdk-current.zip ---- 9 }, 8 -- 9 config_namespace: "tethering_module", 9 use_source_config_var: { 9 var_name: "source_build", ---- com.android.uwb/sdk/uwb-module-sdk-current.zip ---- 4 }, 3 -- 4 config_namespace: "uwb_module", 4 use_source_config_var: { 4 var_name: "source_build", ---- com.android.wifi/sdk/wifi-module-sdk-current.zip ---- 5 }, 4 -- 5 config_namespace: "wifi_module", 5 use_source_config_var: { 5 var_name: "source_build", Ignore-AOSP-First: May not be intended for AOSP as all of these modules are mandatory module and this handles a special use case as per the bug. Change-Id: Ida53175134f675cf1d84f1af51ec07d7ad06cf48 --- build/mainline_modules_sdks.py | 12 ++++++++++++ .../ipsec_Android.bp.expected | 16 ++++++++-------- .../ipsec_tiramisu_Android.bp.additional.expected | 12 ++++++------ .../ipsec_tiramisu_Android.bp.expected | 12 ++++++------ 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index 08b30cb6..86c6dcfd 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -1006,11 +1006,13 @@ MAINLINE_MODULES = [ apex="com.android.adservices", sdks=["adservices-module-sdk"], first_release=Tiramisu, + last_optional_release=LATEST, ), MainlineModule( apex="com.android.appsearch", sdks=["appsearch-sdk"], first_release=Tiramisu, + last_optional_release=LATEST, ), MainlineModule( apex="com.android.art", @@ -1037,6 +1039,7 @@ MAINLINE_MODULES = [ apex="com.android.configinfrastructure", sdks=["configinfrastructure-sdk"], first_release=UpsideDownCake, + last_optional_release=LATEST, ), MainlineModule( apex="com.android.conscrypt", @@ -1050,11 +1053,13 @@ MAINLINE_MODULES = [ # Conscrypt was updatable in R but the generate_ml_bundle.sh does not # appear to generate a snapshot for it. for_r_build=None, + last_optional_release=LATEST, ), MainlineModule( apex="com.android.healthfitness", sdks=["healthfitness-module-sdk"], first_release=UpsideDownCake, + last_optional_release=LATEST, ), MainlineModule( apex="com.android.ipsec", @@ -1066,6 +1071,7 @@ MAINLINE_MODULES = [ shared_library=True, ), ]), + last_optional_release=LATEST, ), MainlineModule( apex="com.android.media", @@ -1074,6 +1080,7 @@ MAINLINE_MODULES = [ for_r_build=ForRBuild(sdk_libraries=[ SdkLibrary(name="framework-media"), ]), + last_optional_release=LATEST, ), MainlineModule( apex="com.android.mediaprovider", @@ -1091,6 +1098,7 @@ MAINLINE_MODULES = [ apex="com.android.ondevicepersonalization", sdks=["ondevicepersonalization-module-sdk"], first_release=Tiramisu, + last_optional_release=LATEST, ), MainlineModule( apex="com.android.permission", @@ -1119,6 +1127,7 @@ MAINLINE_MODULES = [ apex="com.android.scheduling", sdks=["scheduling-sdk"], first_release=S, + last_optional_release=LATEST, ), MainlineModule( apex="com.android.sdkext", @@ -1127,6 +1136,7 @@ MAINLINE_MODULES = [ for_r_build=ForRBuild(sdk_libraries=[ SdkLibrary(name="framework-sdkextensions"), ]), + last_optional_release=LATEST, ), MainlineModule( apex="com.android.os.statsd", @@ -1135,6 +1145,7 @@ MAINLINE_MODULES = [ for_r_build=ForRBuild(sdk_libraries=[ SdkLibrary(name="framework-statsd"), ]), + last_optional_release=LATEST, ), MainlineModule( apex="com.android.tethering", @@ -1143,6 +1154,7 @@ MAINLINE_MODULES = [ for_r_build=ForRBuild(sdk_libraries=[ SdkLibrary(name="framework-tethering"), ]), + last_optional_release=LATEST, ), MainlineModule( apex="com.android.uwb", diff --git a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected index d705ecb4..bc4c54c0 100644 --- a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected +++ b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected @@ -4,8 +4,8 @@ soong_config_module_type { name: "ipsec_prebuilt_java_sdk_library_import", module_type: "java_sdk_library_import", - config_namespace: "ANDROID", - bool_variables: ["module_build_from_source"], + config_namespace: "ipsec_module", + bool_variables: ["source_build"], properties: ["prefer"], } @@ -13,8 +13,8 @@ soong_config_module_type { soong_config_module_type { name: "ipsec_prebuilt_prebuilt_bootclasspath_fragment", module_type: "prebuilt_bootclasspath_fragment", - config_namespace: "ANDROID", - bool_variables: ["module_build_from_source"], + config_namespace: "ipsec_module", + bool_variables: ["source_build"], properties: ["prefer"], } @@ -26,10 +26,10 @@ package { ipsec_prebuilt_prebuilt_bootclasspath_fragment { name: "com.android.ipsec-bootclasspath-fragment", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true. prefer: true, soong_config_variables: { - module_build_from_source: { + source_build: { prefer: false, }, }, @@ -48,10 +48,10 @@ ipsec_prebuilt_prebuilt_bootclasspath_fragment { ipsec_prebuilt_java_sdk_library_import { name: "android.net.ipsec.ike", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true. prefer: true, soong_config_variables: { - module_build_from_source: { + source_build: { prefer: false, }, }, diff --git a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected index 2b844ab6..e8ba1b04 100644 --- a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected +++ b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.additional.expected @@ -8,10 +8,10 @@ package { prebuilt_bootclasspath_fragment { name: "com.android.ipsec-bootclasspath-fragment", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true. use_source_config_var: { - config_namespace: "ANDROID", - var_name: "module_build_from_source", + config_namespace: "ipsec_module", + var_name: "source_build", }, visibility: ["//visibility:public"], apex_available: ["com.android.ipsec"], @@ -28,10 +28,10 @@ prebuilt_bootclasspath_fragment { java_sdk_library_import { name: "android.net.ipsec.ike", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true. use_source_config_var: { - config_namespace: "ANDROID", - var_name: "module_build_from_source", + config_namespace: "ipsec_module", + var_name: "source_build", }, visibility: ["//visibility:public"], apex_available: [ diff --git a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected index 38025d4c..d33b2174 100644 --- a/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected +++ b/build/mainline_modules_sdks_test_data/ipsec_tiramisu_Android.bp.expected @@ -8,10 +8,10 @@ package { prebuilt_bootclasspath_fragment { name: "com.android.ipsec-bootclasspath-fragment", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true. use_source_config_var: { - config_namespace: "ANDROID", - var_name: "module_build_from_source", + config_namespace: "ipsec_module", + var_name: "source_build", }, visibility: ["//visibility:public"], apex_available: ["com.android.ipsec"], @@ -28,10 +28,10 @@ prebuilt_bootclasspath_fragment { java_sdk_library_import { name: "android.net.ipsec.ike", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "ipsec_module" is true. use_source_config_var: { - config_namespace: "ANDROID", - var_name: "module_build_from_source", + config_namespace: "ipsec_module", + var_name: "source_build", }, visibility: ["//visibility:public"], apex_available: [ -- cgit v1.2.3