diff options
| author | Liz Kammer <eakammer@google.com> | 2022-05-26 15:31:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-26 15:31:51 +0000 |
| commit | 202b3d92455ee19a623adc10c2da683244335052 (patch) | |
| tree | 02c8ed3a6161166b6796d5bc283711a062321129 | |
| parent | ee6b4655af2e9850e9204a5da99e2cd4742b323c (diff) | |
| parent | fc0ea40e8d94a5837ff5ce50bb0f9ed90bbf65c9 (diff) | |
| download | common-202b3d92455ee19a623adc10c2da683244335052.tar.gz | |
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>
| -rw-r--r-- | sdk/ModuleDefaults.bp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp index 2b40173c..057d3c65 100644 --- a/sdk/ModuleDefaults.bp +++ b/sdk/ModuleDefaults.bp @@ -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", |