Changes for September 2021, syncing up to v312
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From e3c7e720c893a6ecef90b4b950787ed820792581 Mon Sep 17 00:00:00 2001
|
||||
From 0fd8513d53c1de4d9dee64cb03ce4e28ffd21070 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 12 Sep 2019 12:54:23 +0200
|
||||
Subject: [PATCH 1/2] Use vndk_lite ld.config only on same-version vendor
|
||||
@@ -16,10 +16,10 @@ Change-Id: I55257cd7c738b1d20582e198e1d5621e1c87a03e
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/linker/linker.cpp b/linker/linker.cpp
|
||||
index f24167722..a82d7c430 100644
|
||||
index c87118b9f..6df9cfe23 100644
|
||||
--- a/linker/linker.cpp
|
||||
+++ b/linker/linker.cpp
|
||||
@@ -3372,7 +3372,10 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
|
||||
@@ -3443,7 +3443,10 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
|
||||
}
|
||||
|
||||
static std::string get_ld_config_file_vndk_path() {
|
||||
@@ -32,5 +32,5 @@ index f24167722..a82d7c430 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 709393961b2c65d2e9c50fdb5c2db3370811da5c Mon Sep 17 00:00:00 2001
|
||||
From 4d9b1dd121a9c5444cc313914e67c738a27fec0c Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 26 Oct 2020 23:23:24 +0100
|
||||
Subject: [PATCH 3/3] Ignore vndk lite when looking for ld.config
|
||||
Subject: [PATCH 2/2] Ignore vndk lite when looking for ld.config
|
||||
|
||||
Change-Id: I6927ba11dcb8435fab1866985c177a1852488414
|
||||
---
|
||||
@@ -9,7 +9,7 @@ Change-Id: I6927ba11dcb8435fab1866985c177a1852488414
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/linker/linker.cpp b/linker/linker.cpp
|
||||
index ae2c00c21..ea504c91e 100644
|
||||
index 6df9cfe23..62d39fa53 100644
|
||||
--- a/linker/linker.cpp
|
||||
+++ b/linker/linker.cpp
|
||||
@@ -93,7 +93,6 @@ static uint64_t g_module_unload_counter = 0;
|
||||
@@ -20,7 +20,7 @@ index ae2c00c21..ea504c91e 100644
|
||||
|
||||
static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt";
|
||||
|
||||
@@ -3372,13 +3371,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
|
||||
@@ -3443,13 +3442,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
|
||||
}
|
||||
|
||||
static std::string get_ld_config_file_vndk_path() {
|
||||
@@ -35,5 +35,5 @@ index ae2c00c21..ea504c91e 100644
|
||||
size_t insert_pos = ld_config_file_vndk.find_last_of('.');
|
||||
if (insert_pos == std::string::npos) {
|
||||
--
|
||||
2.17.1
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user