Add default that supports dcla + r launched am: fc0ea40e8d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2107284

Change-Id: I566a1022c4d30e72808eac2a03436ba4465f36eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liz Kammer
2022-05-26 15:31:51 +00:00
committed by Automerger Merge Worker

View File

@@ -214,6 +214,29 @@ apex_defaults {
defaults_visibility: ["//visibility:public"], defaults_visibility: ["//visibility:public"],
} }
DCLA_MIN_SDK_VERSION = "31"
soong_config_module_type_import {
from: "system/apex/Android.bp",
module_types: ["library_linking_strategy_apex_defaults"],
}
library_linking_strategy_apex_defaults {
name: "r-launched-dcla-enabled-apex-module",
defaults_visibility: ["//packages/modules/adb:__subpackages__"],
defaults: ["r-launched-apex-module"],
soong_config_variables: {
library_linking_strategy: {
// Use the R min_sdk_version
prefer_static: {},
// Override the R min_sdk_version to min_sdk_version that supports dcla
conditions_default: {
min_sdk_version: DCLA_MIN_SDK_VERSION,
},
},
},
}
apex_defaults { apex_defaults {
name: "s-launched-apex-module", name: "s-launched-apex-module",
min_sdk_version: "31", min_sdk_version: "31",