diff options
-rw-r--r-- | linker/Android.bp | 3 | ||||
-rw-r--r-- | linker/linker.cpp | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/linker/Android.bp b/linker/Android.bp index 435ae8cf7..5f8367ee9 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -92,6 +92,9 @@ cc_defaults { cppflags: ["-DUSE_LD_CONFIG_FILE"], }, lineage: { + target_process_sdk_version_override: { + cppflags: ["-DSDK_VERSION_OVERRIDES=\"%s\""], + }, target_shim_libs: { cppflags: ["-DLD_SHIM_LIBS=\"%s\""], }, diff --git a/linker/linker.cpp b/linker/linker.cpp index 25cfd300e..c87118b9f 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -3601,7 +3601,18 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable } } - set_application_target_sdk_version(config->target_sdk_version()); + uint32_t target_sdk = config->target_sdk_version(); +#ifdef SDK_VERSION_OVERRIDES + for (const auto& entry : android::base::Split(SDK_VERSION_OVERRIDES, " ")) { + auto splitted = android::base::Split(entry, "="); + if (splitted.size() == 2 && splitted[0] == executable_path) { + target_sdk = static_cast<uint32_t>(std::stoul(splitted[1])); + break; + } + } + DEBUG("Target SDK for %s = %d", executable_path, target_sdk); +#endif + set_application_target_sdk_version(target_sdk); std::vector<android_namespace_t*> created_namespaces; created_namespaces.reserve(namespaces.size()); |