Add default that supports dcla + r launched
Test: m com.android.adbd Change-Id: Iac536f8b373670aebfb4a736b3bb38ddc83df044
This commit is contained in:
@@ -214,6 +214,29 @@ apex_defaults {
|
||||
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 {
|
||||
name: "s-launched-apex-module",
|
||||
min_sdk_version: "31",
|
||||
|
||||
Reference in New Issue
Block a user