From 3340b711f4656a45850c0883811ab7f2acfab578 Mon Sep 17 00:00:00 2001 From: Hassan Ali Date: Mon, 19 Jun 2023 10:59:35 +0000 Subject: Bump min_sdk_version for all launched apex modules Increase the minimum value for q-launched-apex-module to avoid targeting EoL'd dessert releases as part of stopping mainline updates for Q "Sunset plan for Mainline on Android Q" Previous-Platform-Support: (minSdkVersion=29) Apex-Size-Increase: 0 Aosp-First: Aosp Test-Info: No behavior change. Test: m Bug: 254749391 Bug: 265172663 Ignore-AOSP-First: submitted the change in aosp/2390852 Change-Id: I3f53796448c28dcc03d4be488d78214818894e06 Merged-In: Iddf31c87ee29031921f24214aabc00ff0896905d --- build/allowed_deps.txt | 2 ++ sdk/ModuleDefaults.bp | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 9cf3ab34..bd1ad19b 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -779,8 +779,10 @@ liburl(minSdkVersion:29) libutf(minSdkVersion:(no version)) libutf(minSdkVersion:14) libutils(minSdkVersion:29) +libutils(minSdkVersion:30) libutils(minSdkVersion:apex_inherit) libutils_headers(minSdkVersion:29) +libutils_headers(minSdkVersion:30) libutils_headers(minSdkVersion:apex_inherit) libuwb_uci_packets(minSdkVersion:Tiramisu) libvorbisidec(minSdkVersion:29) diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp index 9ffce3af..d8d95b97 100644 --- a/sdk/ModuleDefaults.bp +++ b/sdk/ModuleDefaults.bp @@ -239,7 +239,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 +251,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 +313,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, -- cgit v1.2.3