Regenerate patches
frameworks/base got too messy, time to clean it up
This commit is contained in:
+6
-6
@@ -1,7 +1,7 @@
|
||||
From e77d8ff8326def1d6b457bfd4c8b232dc58dd7cb Mon Sep 17 00:00:00 2001
|
||||
From 3e18df7a3462d3b81ac4cbc23b1e8721f2f3722c Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 3 Jan 2019 17:50:03 +0100
|
||||
Subject: [PATCH 4/6] Read SDK version override from property
|
||||
Subject: [PATCH 1/2] Read SDK version override from property
|
||||
|
||||
Change-Id: I88ca5d0bde15ee4f2b2bd1255e98f9592973dbf9
|
||||
---
|
||||
@@ -9,10 +9,10 @@ Change-Id: I88ca5d0bde15ee4f2b2bd1255e98f9592973dbf9
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/linker/linker.cpp b/linker/linker.cpp
|
||||
index ccdb131ca..f45a40b9d 100644
|
||||
index 6941fde20..c4730ec20 100644
|
||||
--- a/linker/linker.cpp
|
||||
+++ b/linker/linker.cpp
|
||||
@@ -4218,7 +4218,9 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
|
||||
@@ -4296,7 +4296,9 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
|
||||
}
|
||||
|
||||
uint32_t target_sdk = config->target_sdk_version();
|
||||
@@ -23,7 +23,7 @@ index ccdb131ca..f45a40b9d 100644
|
||||
for (const auto& entry : android::base::Split(SDK_VERSION_OVERRIDES, " ")) {
|
||||
auto splitted = android::base::Split(entry, "=");
|
||||
if (splitted.size() == 2 && splitted[0] == executable_path) {
|
||||
@@ -4227,7 +4229,7 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
|
||||
@@ -4305,7 +4307,7 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
|
||||
}
|
||||
}
|
||||
DEBUG("Target SDK for %s = %d", executable_path, target_sdk);
|
||||
@@ -33,5 +33,5 @@ index ccdb131ca..f45a40b9d 100644
|
||||
|
||||
std::vector<android_namespace_t*> created_namespaces;
|
||||
--
|
||||
2.17.1
|
||||
2.25.1
|
||||
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
From f32750cc994642f6ba792051f20c3f930f3007d2 Mon Sep 17 00:00:00 2001
|
||||
From 1823be14501a6c116f6d5e87570dea1af2c68413 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 5/6] Use vndk_lite ld.config only on same-version vendor
|
||||
Subject: [PATCH 2/2] Use vndk_lite ld.config only on same-version vendor
|
||||
|
||||
When running Q over P lite, there is currently absolutely no chance the
|
||||
device boots, because it will be using Q vndk.
|
||||
@@ -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 f45a40b9d..9082fde53 100644
|
||||
index c4730ec20..337811951 100644
|
||||
--- a/linker/linker.cpp
|
||||
+++ b/linker/linker.cpp
|
||||
@@ -4069,7 +4069,10 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
|
||||
@@ -4147,7 +4147,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 f45a40b9d..9082fde53 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.1
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user