37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 26b9c0d76d940676fc12d7f27c13180a4d4bd8e1 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Hugues Husson <phh@phh.me>
|
|
Date: Wed, 27 Oct 2021 14:39:29 -0400
|
|
Subject: [PATCH 1/4] Disable vndklite handling
|
|
|
|
Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
|
|
---
|
|
linker/linker.cpp | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/linker/linker.cpp b/linker/linker.cpp
|
|
index 5df379936..ceaba7d95 100644
|
|
--- a/linker/linker.cpp
|
|
+++ b/linker/linker.cpp
|
|
@@ -93,7 +93,6 @@ static uint64_t g_module_unload_counter = 0;
|
|
static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt";
|
|
|
|
static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
|
|
-static const char* const kLdConfigVndkLiteFilePath = "/system/etc/ld.config.vndk_lite.txt";
|
|
|
|
static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt";
|
|
|
|
@@ -3436,10 +3435,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
|
|
}
|
|
|
|
static std::string get_ld_config_file_vndk_path() {
|
|
- if (android::base::GetBoolProperty("ro.vndk.lite", false)) {
|
|
- return kLdConfigVndkLiteFilePath;
|
|
- }
|
|
-
|
|
std::string ld_config_file_vndk = kLdConfigFilePath;
|
|
size_t insert_pos = ld_config_file_vndk.find_last_of('.');
|
|
if (insert_pos == std::string::npos) {
|
|
--
|
|
2.34.1
|
|
|