Changes for March 2022, syncing up to v410

patches_treble/build_make/0001-Remove-init.vndk-nodef.rc.patch

@@ -1,4 +1,4 @@
-From ff787114856cc9ccb057cf524e7089f7aed558cc Mon Sep 17 00:00:00 2001
+From 7891d4dd5e8ef676e94f65cc66a362c21af24a84 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 8 Dec 2021 07:04:53 +0000
 Subject: [PATCH] Remove init.vndk-nodef.rc
@@ -58,7 +58,7 @@ index efeef117b..000000000
 -    # Must define BOARD_VNDK_VERSION
 -    exec - root -- /system/bin/reboot bootloader
 diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
-index d924d0bc1..5c3e10de7 100644
+index a2a29ed0f..74413b191 100644
 --- a/target/product/gsi_release.mk
 +++ b/target/product/gsi_release.mk
 @@ -59,8 +59,7 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
@@ -69,8 +69,8 @@ index d924d0bc1..5c3e10de7 100644
 -    init.vndk-nodef.rc \
 +    init.gsi.rc
  
- # Support additional P, Q and R VNDK packages
- PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30
+ # Support additional VNDK snapshots
+ PRODUCT_EXTRA_VNDK_VERSIONS := \
 -- 
 2.25.1
 

patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch

@@ -1,7 +1,7 @@
-From 978be1fd8202655676e335cdd611f9c6756c0025 Mon Sep 17 00:00:00 2001
+From 26669a1e511d9622a55795b611ed10b4d55ee54f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 01:43:40 +0000
-Subject: [PATCH 1/4] treble: Lineage-ify
+Subject: [PATCH 1/5] treble: Lineage-ify
 
 Squash of:
 - Proper target names
@@ -14,11 +14,11 @@ Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
 ---
  base-pre.mk                                   |  3 -
  base.mk                                       | 16 ++--
- generate.sh                                   |  3 +
+ generate.sh                                   |  2 +-
  .../lineage/res/res/values/config.xml         | 81 +++++++++++++++++++
  .../base/core/res/res/values/config.xml       |  1 -
  sepolicy/file_contexts                        |  3 -
- 6 files changed, 93 insertions(+), 14 deletions(-)
+ 6 files changed, 91 insertions(+), 15 deletions(-)
  create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 
 diff --git a/base-pre.mk b/base-pre.mk
@@ -30,7 +30,7 @@ index 6a317e4..e69de29 100644
 -PRODUCT_COPY_FILES += \
 -	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 diff --git a/base.mk b/base.mk
-index 73abbab..057ad0c 100644
+index 7020df2..c87986e 100644
 --- a/base.mk
 +++ b/base.mk
 @@ -8,12 +8,14 @@ PRODUCT_COPY_FILES := \
@@ -68,16 +68,15 @@ index 73abbab..057ad0c 100644
  #VNDK config files
  PRODUCT_COPY_FILES += \
 diff --git a/generate.sh b/generate.sh
-index 352fe12..7e4f137 100644
+index 352fe12..623a9ce 100644
 --- a/generate.sh
 +++ b/generate.sh
-@@ -65,6 +65,9 @@ for part in a ab;do
+@@ -64,7 +64,7 @@ for part in a ab;do
+ 					optional_base='$(call inherit-product, device/phh/treble/base-sas.mk)'
  				fi
  
- 				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
-+				if [ "$1" == "lineage" ];then
-+					target="lineage_${target}"
-+				fi
+-				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
++				target="lineage_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
  
  				baseArch="$arch"
  				if [ "$arch" = "a64" ];then

patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch

@@ -1,7 +1,7 @@
-From 7ebb3f6332087fb5243955bb28c656e14a411660 Mon Sep 17 00:00:00 2001
+From 93b03ccb8f4572de3af7795da5572ea337f8fb80 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 09:29:32 +0000
-Subject: [PATCH 2/4] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
+Subject: [PATCH 2/5] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
 
 Change-Id: I725443154fabde548d2e6c1b072d34c27596c421
 ---

patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch

@@ -1,7 +1,7 @@
-From 56c20273ac8c3c34de36f80edc2e94fc5f60b78a Mon Sep 17 00:00:00 2001
+From 28e5f836e3bfc674e7466320f755751edd33886a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 20 Oct 2021 11:30:25 +0000
-Subject: [PATCH 3/4] treble: Set TARGET_NO_KERNEL_OVERRIDE
+Subject: [PATCH 3/5] treble: Set TARGET_NO_KERNEL_OVERRIDE
 
 Taken from Lineage generic targets - skips building kernel cleanly
 

patches_treble/device_phh_treble/0004-treble-Set-OTA-JSON-URL.patch

@@ -0,0 +1,24 @@
+From dbd801eb83540152467c56bb328d415ebeb82685 Mon Sep 17 00:00:00 2001
+From: Alberto Ponces <ponces26@gmail.com>
+Date: Wed, 9 Feb 2022 12:34:47 +0000
+Subject: [PATCH 4/5] treble: Set OTA JSON URL
+
+Change-Id: I8f817b90d42629c208ceb45598daf5293850b953
+---
+ lineage.mk | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lineage.mk b/lineage.mk
+index 172bb01..68b57f4 100644
+--- a/lineage.mk
++++ b/lineage.mk
+@@ -1,3 +1,6 @@
+ $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+ -include vendor/lineage/build/core/config.mk
+ -include vendor/lineage/build/core/apicheck.mk
++
++PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
++    ro.system.ota.json_url=https://downloads.sourceforge.net/project/andyyan-gsi/lineage-19.x/ota.json
+-- 
+2.25.1
+

patches_treble/device_phh_treble/0005-add-offline-charger-sepolicy.patch

@@ -1,7 +1,7 @@
-From 39c3d994822d367cad58827e6cfa8dcd7e13b519 Mon Sep 17 00:00:00 2001
+From 11c35f78a117c21de95131b8318bf41e53e4f4ec Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Tue, 15 Sep 2020 21:26:45 -0400
-Subject: [PATCH 4/4] add offline charger sepolicy
+Subject: [PATCH 5/5] add offline charger sepolicy
 
 ---
  sepolicy/gsicharger.te | 1 +

patches_treble/system_core/0001-Revert-init-Add-vendor-specific-initialization-hooks.patch

@@ -1,9 +1,9 @@
-From 291265e4179a03a9407ed2e7a7f898be0eb25e00 Mon Sep 17 00:00:00 2001
+From 5e9668c16e8cd71526cb2b451c9a072ed14f12dc Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sat, 6 Nov 2021 05:43:23 +0000
+Date: Sun, 13 Mar 2022 11:06:37 +0000
 Subject: [PATCH 1/4] Revert "init: Add vendor-specific initialization hooks."
 
-This reverts commit e2dc41bcfb140e0119e0f7e34eccfb2335ae7f89.
+This reverts commit 99ef051a7d0d34103babf5f2297dd2747c28570c.
 ---
  init/Android.bp           |  9 ---------
  init/NOTICE               | 26 --------------------------
@@ -15,7 +15,7 @@ This reverts commit e2dc41bcfb140e0119e0f7e34eccfb2335ae7f89.
  delete mode 100644 init/vendor_init.h
 
 diff --git a/init/Android.bp b/init/Android.bp
-index 69f8815ed..7eeafa24b 100644
+index 00ac6a752..a57f3a407 100644
 --- a/init/Android.bp
 +++ b/init/Android.bp
 @@ -89,14 +89,6 @@ init_host_sources = [
@@ -30,10 +30,10 @@ index 69f8815ed..7eeafa24b 100644
 -    ],
 -}
 -
- cc_defaults {
-     name: "init_defaults",
-     sanitize: {
-@@ -190,7 +182,6 @@ cc_library_static {
+ soong_config_module_type {
+     name: "libinit_cc_defaults",
+     module_type: "cc_defaults",
+@@ -211,7 +203,6 @@ cc_library_static {
      defaults: [
          "init_defaults",
          "selinux_policy_version",
@@ -76,7 +76,7 @@ index 383d0f541..c5b1efa7a 100644
 -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
+index 1600744ff..49500428e 100644
 --- a/init/property_service.cpp
 +++ b/init/property_service.cpp
 @@ -73,7 +73,6 @@
@@ -87,7 +87,7 @@ index bc9a29dea..5974065f5 100644
  
  using namespace std::literals;
  
-@@ -1097,9 +1096,6 @@ void PropertyLoadBootDefaults() {
+@@ -1102,9 +1101,6 @@ void PropertyLoadBootDefaults() {
          }
      }
  

patches_treble/system_core/0002-Panic-into-recovery-rather-than-bootloader.patch

@@ -1,4 +1,4 @@
-From 0263909a309cbc35efd586b4aec14e46ed23e2d7 Mon Sep 17 00:00:00 2001
+From 4007d7537bdff0aa9ee444731c57a5a9b2b84256 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 2/4] Panic into recovery rather than bootloader

patches_treble/system_core/0003-Restore-sbin-for-Magisk-compatibility.patch

@@ -1,4 +1,4 @@
-From e2392f1b2f4afbf783fd6b1b25c2d905828c71f1 Mon Sep 17 00:00:00 2001
+From 7b79958277c40838fdbbcd7c9324cb9543318290 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Wed, 3 Mar 2021 06:31:17 -0500
 Subject: [PATCH 3/4] Restore /sbin for Magisk compatibility

patches_treble/system_core/0004-fix-offline-charger-v7.patch

@@ -1,4 +1,4 @@
-From 1c13959077f9616c050b4ee92420f561b3af6121 Mon Sep 17 00:00:00 2001
+From e3589c745007dbc2f9c983dd68f0fc82fdd56244 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Wed, 26 Feb 2020 07:23:44 +0200
 Subject: [PATCH 4/4] fix offline charger v7
@@ -9,7 +9,7 @@ Subject: [PATCH 4/4] fix offline charger v7
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/rootdir/init.rc b/rootdir/init.rc
-index 376a678a8..6434d06bf 100644
+index 5116c0fea..76f2bf60e 100644
 --- a/rootdir/init.rc
 +++ b/rootdir/init.rc
 @@ -11,6 +11,11 @@ import /vendor/etc/init/hw/init.${ro.hardware}.rc
@@ -24,7 +24,7 @@ index 376a678a8..6434d06bf 100644
  # Cgroups are mounted right before early-init using list from /etc/cgroups.json
  on early-init
      # Disable sysrq from keyboard
-@@ -452,7 +457,7 @@ on init
+@@ -456,7 +461,7 @@ on init
  # Healthd can trigger a full boot from charger mode by signaling this
  # property when the power button is held.
  on property:sys.boot_from_charger_mode=1
@@ -33,7 +33,7 @@ index 376a678a8..6434d06bf 100644
      trigger late-init
  
  on load_persist_props_action
-@@ -1090,8 +1095,12 @@ on nonencrypted
+@@ -1108,8 +1113,12 @@ on nonencrypted
  on property:sys.init_log_level=*
      loglevel ${sys.init_log_level}