Changes for November 2021, syncing up to v400.c
This commit is contained in:
Andy CrossGate Yan
+184
@@ -0,0 +1,184 @@
|
||||
From 291265e4179a03a9407ed2e7a7f898be0eb25e00 Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Sat, 6 Nov 2021 05:43:23 +0000
|
||||
Subject: [PATCH 1/4] Revert "init: Add vendor-specific initialization hooks."
|
||||
|
||||
This reverts commit e2dc41bcfb140e0119e0f7e34eccfb2335ae7f89.
|
||||
---
|
||||
init/Android.bp | 9 ---------
|
||||
init/NOTICE | 26 --------------------------
|
||||
init/property_service.cpp | 4 ----
|
||||
init/vendor_init.cpp | 37 -------------------------------------
|
||||
init/vendor_init.h | 33 ---------------------------------
|
||||
5 files changed, 109 deletions(-)
|
||||
delete mode 100644 init/vendor_init.cpp
|
||||
delete mode 100644 init/vendor_init.h
|
||||
|
||||
diff --git a/init/Android.bp b/init/Android.bp
|
||||
index 69f8815ed..7eeafa24b 100644
|
||||
--- a/init/Android.bp
|
||||
+++ b/init/Android.bp
|
||||
@@ -89,14 +89,6 @@ init_host_sources = [
|
||||
"host_init_verifier.cpp",
|
||||
]
|
||||
|
||||
-cc_library_static {
|
||||
- name: "vendor_init",
|
||||
- recovery_available: true,
|
||||
- srcs: [
|
||||
- "vendor_init.cpp",
|
||||
- ],
|
||||
-}
|
||||
-
|
||||
cc_defaults {
|
||||
name: "init_defaults",
|
||||
sanitize: {
|
||||
@@ -190,7 +182,6 @@ cc_library_static {
|
||||
defaults: [
|
||||
"init_defaults",
|
||||
"selinux_policy_version",
|
||||
- "vendor_init_defaults",
|
||||
],
|
||||
srcs: init_common_sources + init_device_sources,
|
||||
generated_sources: [
|
||||
diff --git a/init/NOTICE b/init/NOTICE
|
||||
index 383d0f541..c5b1efa7a 100644
|
||||
--- a/init/NOTICE
|
||||
+++ b/init/NOTICE
|
||||
@@ -188,29 +188,3 @@
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
-Copyright (c) 2013, The Linux Foundation. All rights reserved.
|
||||
-
|
||||
-Redistribution and use in source and binary forms, with or without
|
||||
-modification, are permitted provided that the following conditions are
|
||||
-met:
|
||||
- * Redistributions of source code must retain the above copyright
|
||||
- notice, this list of conditions and the following disclaimer.
|
||||
- * Redistributions in binary form must reproduce the above
|
||||
- copyright notice, this list of conditions and the following
|
||||
- disclaimer in the documentation and/or other materials provided
|
||||
- with the distribution.
|
||||
- * Neither the name of The Linux Foundation nor the names of its
|
||||
- contributors may be used to endorse or promote products derived
|
||||
- from this software without specific prior written permission.
|
||||
-
|
||||
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
||||
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
diff --git a/init/property_service.cpp b/init/property_service.cpp
|
||||
index bc9a29dea..5974065f5 100644
|
||||
--- a/init/property_service.cpp
|
||||
+++ b/init/property_service.cpp
|
||||
@@ -73,7 +73,6 @@
|
||||
#include "subcontext.h"
|
||||
#include "system/core/init/property_service.pb.h"
|
||||
#include "util.h"
|
||||
-#include "vendor_init.h"
|
||||
|
||||
using namespace std::literals;
|
||||
|
||||
@@ -1097,9 +1096,6 @@ void PropertyLoadBootDefaults() {
|
||||
}
|
||||
}
|
||||
|
||||
- // Update with vendor-specific property runtime overrides
|
||||
- vendor_load_properties();
|
||||
-
|
||||
property_initialize_ro_product_props();
|
||||
property_initialize_build_id();
|
||||
property_derive_build_fingerprint();
|
||||
diff --git a/init/vendor_init.cpp b/init/vendor_init.cpp
|
||||
deleted file mode 100644
|
||||
index d3fd5ffe2..000000000
|
||||
--- a/init/vendor_init.cpp
|
||||
+++ /dev/null
|
||||
@@ -1,37 +0,0 @@
|
||||
-/*
|
||||
-Copyright (c) 2013, The Linux Foundation. All rights reserved.
|
||||
-
|
||||
-Redistribution and use in source and binary forms, with or without
|
||||
-modification, are permitted provided that the following conditions are
|
||||
-met:
|
||||
- * Redistributions of source code must retain the above copyright
|
||||
- notice, this list of conditions and the following disclaimer.
|
||||
- * Redistributions in binary form must reproduce the above
|
||||
- copyright notice, this list of conditions and the following
|
||||
- disclaimer in the documentation and/or other materials provided
|
||||
- with the distribution.
|
||||
- * Neither the name of The Linux Foundation nor the names of its
|
||||
- contributors may be used to endorse or promote products derived
|
||||
- from this software without specific prior written permission.
|
||||
-
|
||||
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
||||
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
- */
|
||||
-
|
||||
-#include "vendor_init.h"
|
||||
-
|
||||
-/* init vendor override stubs */
|
||||
-
|
||||
-__attribute__ ((weak))
|
||||
-void vendor_load_properties()
|
||||
-{
|
||||
-}
|
||||
diff --git a/init/vendor_init.h b/init/vendor_init.h
|
||||
deleted file mode 100644
|
||||
index 9afb449be..000000000
|
||||
--- a/init/vendor_init.h
|
||||
+++ /dev/null
|
||||
@@ -1,33 +0,0 @@
|
||||
-/*
|
||||
-Copyright (c) 2013, The Linux Foundation. All rights reserved.
|
||||
-
|
||||
-Redistribution and use in source and binary forms, with or without
|
||||
-modification, are permitted provided that the following conditions are
|
||||
-met:
|
||||
- * Redistributions of source code must retain the above copyright
|
||||
- notice, this list of conditions and the following disclaimer.
|
||||
- * Redistributions in binary form must reproduce the above
|
||||
- copyright notice, this list of conditions and the following
|
||||
- disclaimer in the documentation and/or other materials provided
|
||||
- with the distribution.
|
||||
- * Neither the name of The Linux Foundation nor the names of its
|
||||
- contributors may be used to endorse or promote products derived
|
||||
- from this software without specific prior written permission.
|
||||
-
|
||||
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
||||
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
- */
|
||||
-
|
||||
-#ifndef __INIT_VENDOR__H__
|
||||
-#define __INIT_VENDOR__H__
|
||||
-extern void vendor_load_properties(void);
|
||||
-#endif /* __INIT_VENDOR__H__ */
|
||||
--
|
||||
2.25.1
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From ed8e7d31d3d96f9ce4f30aa452038d1eb2e9b561 Mon Sep 17 00:00:00 2001
|
||||
From 0263909a309cbc35efd586b4aec14e46ed23e2d7 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 4 Sep 2019 21:11:48 +0200
|
||||
Subject: [PATCH 1/3] Panic into recovery rather than bootloader
|
||||
Subject: [PATCH 2/4] Panic into recovery rather than bootloader
|
||||
|
||||
Getting last_kmsg/pstore from bootloader isn't possible for other people
|
||||
than the OEM, but we have TWRP to access last_kmsg/pstore
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From fd8c95c473df2b62fd22ce3711b8ec7cfd2a337b Mon Sep 17 00:00:00 2001
|
||||
From e2392f1b2f4afbf783fd6b1b25c2d905828c71f1 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Bo <bvoid@yandex.ru>
|
||||
Date: Wed, 3 Mar 2021 06:31:17 -0500
|
||||
Subject: [PATCH 2/3] Restore /sbin for Magisk compatibility
|
||||
Subject: [PATCH 3/4] Restore /sbin for Magisk compatibility
|
||||
|
||||
Squash of:
|
||||
- Revert "Do not create /sbin"
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 786f091175fad5b95b27e3806f5dd775f992826b Mon Sep 17 00:00:00 2001
|
||||
From 1c13959077f9616c050b4ee92420f561b3af6121 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Bo <bvoid@yandex.ru>
|
||||
Date: Wed, 26 Feb 2020 07:23:44 +0200
|
||||
Subject: [PATCH 3/3] fix offline charger v7
|
||||
Subject: [PATCH 4/4] fix offline charger v7
|
||||
|
||||
modified: rootdir/init.rc
|
||||
---
|
||||
Reference in New Issue
Block a user