Merge "Create a common base apex_defaults" am: 448d2f87c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2390852 Change-Id: I60a62399197c6e95bd960219a425025c8a5804f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
127827706d
@@ -229,14 +229,22 @@ java_defaults {
|
||||
|
||||
// These apex_defaults serve as a common place to add properties which should
|
||||
// affect all mainline modules.
|
||||
|
||||
APEX_LOWEST_MIN_SDK_VERSION = "29"
|
||||
DCLA_MIN_SDK_VERSION = "31"
|
||||
|
||||
apex_defaults {
|
||||
name: "q-launched-apex-module",
|
||||
min_sdk_version: "29",
|
||||
name: "any-launched-apex-modules",
|
||||
updatable: true,
|
||||
defaults_visibility: ["//visibility:public"],
|
||||
}
|
||||
|
||||
DCLA_MIN_SDK_VERSION = "31"
|
||||
apex_defaults {
|
||||
name: "q-launched-apex-module",
|
||||
defaults: ["any-launched-apex-modules"],
|
||||
min_sdk_version: "29",
|
||||
defaults_visibility: ["//visibility:public"],
|
||||
}
|
||||
|
||||
soong_config_module_type_import {
|
||||
from: "system/apex/Android.bp",
|
||||
@@ -268,8 +276,8 @@ library_linking_strategy_apex_defaults {
|
||||
|
||||
apex_defaults {
|
||||
name: "r-launched-apex-module",
|
||||
defaults: ["any-launched-apex-modules"],
|
||||
min_sdk_version: "30",
|
||||
updatable: true,
|
||||
defaults_visibility: ["//visibility:public"],
|
||||
}
|
||||
|
||||
@@ -294,6 +302,7 @@ library_linking_strategy_apex_defaults {
|
||||
|
||||
apex_defaults {
|
||||
name: "s-launched-apex-module",
|
||||
defaults: ["any-launched-apex-modules"],
|
||||
min_sdk_version: "31",
|
||||
// Indicates that pre-installed version of this apex can be compressed.
|
||||
// Whether it actually will be compressed is controlled on per-device basis.
|
||||
@@ -307,8 +316,8 @@ apex_defaults {
|
||||
|
||||
apex_defaults {
|
||||
name: "t-launched-apex-module",
|
||||
defaults: ["any-launched-apex-modules"],
|
||||
min_sdk_version: "Tiramisu",
|
||||
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,
|
||||
@@ -318,16 +327,14 @@ apex_defaults {
|
||||
|
||||
apex_defaults {
|
||||
name: "u-launched-apex-module",
|
||||
defaults: ["any-launched-apex-modules"],
|
||||
min_sdk_version: "UpsideDownCake",
|
||||
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,
|
||||
defaults_visibility: ["//packages/modules:__subpackages__"],
|
||||
}
|
||||
|
||||
APEX_LOWEST_MIN_SDK_VERSION = "29"
|
||||
|
||||
library_linking_strategy_cc_defaults {
|
||||
name: "apex-lowest-min-sdk-version",
|
||||
defaults_visibility: [
|
||||
|
||||
Reference in New Issue
Block a user