diff options
| author | Saeid Farivar Asanjan <farivar@google.com> | 2023-06-21 15:57:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-06-21 15:57:17 +0000 |
| commit | e96b8b281e1f41907d6adf77d6db357c3c642c53 (patch) | |
| tree | 5d4e045984f23163e49da2b9d4a7e0e4dc05ee94 | |
| parent | abb5a95ced441aebc1617cd2ca14ac173d679262 (diff) | |
| parent | 3340b711f4656a45850c0883811ab7f2acfab578 (diff) | |
| download | common-android14-dev.tar.gz | |
Merge "Bump min_sdk_version for all launched apex modules" into udc-devandroid14-dev
| -rw-r--r-- | build/allowed_deps.txt | 2 | ||||
| -rw-r--r-- | 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, |