Merge AOSP trunk
Bug: 262638121 Merged-In: I4127e843cf1caf460a1c6b949a97ef3418ff895c Change-Id: Ic6c35a46bb462f904e8e2802853715cc57c92729
This commit is contained in:
@@ -240,7 +240,10 @@ DCLA_MIN_SDK_VERSION = "31"
|
||||
|
||||
soong_config_module_type_import {
|
||||
from: "system/apex/Android.bp",
|
||||
module_types: ["library_linking_strategy_apex_defaults"],
|
||||
module_types: [
|
||||
"library_linking_strategy_apex_defaults",
|
||||
"library_linking_strategy_cc_defaults",
|
||||
],
|
||||
}
|
||||
|
||||
library_linking_strategy_apex_defaults {
|
||||
@@ -322,3 +325,20 @@ apex_defaults {
|
||||
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: [
|
||||
"//system/core/libutils",
|
||||
],
|
||||
min_sdk_version: APEX_LOWEST_MIN_SDK_VERSION,
|
||||
soong_config_variables: {
|
||||
library_linking_strategy: {
|
||||
prefer_static: {
|
||||
min_sdk_version: "apex_inherit",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user