Changes for December 2021

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

@@ -1,22 +1,24 @@
-From defdefa842a5673bac917c9f5c2508aece8eebb8 Mon Sep 17 00:00:00 2001
+From d884ed740455da2dc943c14b7c2c41b5a2236c74 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
 
 Squash of:
-- Revert "Update lineage.mk for LineageOS 16.0"
+- Proper target names
 - Remove fsck SELinux labels
 - treble: Add overlay-lineage
 - treble: Don't specify config_wallpaperCropperPackage
 - treble: Don't handle apns-conf
+
+Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
 ---
  base-pre.mk                                   |  3 -
  base.mk                                       | 16 ++--
- lineage.mk                                    |  1 +
+ generate.sh                                   |  3 +
  .../lineage/res/res/values/config.xml         | 81 +++++++++++++++++++
  .../base/core/res/res/values/config.xml       |  1 -
  sepolicy/file_contexts                        |  3 -
- 6 files changed, 91 insertions(+), 14 deletions(-)
+ 6 files changed, 93 insertions(+), 14 deletions(-)
  create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 
 diff --git a/base-pre.mk b/base-pre.mk
@@ -28,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 3697c49..0bd6bf0 100644
+index 3655b72..ce99bcc 100644
 --- a/base.mk
 +++ b/base.mk
 @@ -8,12 +8,14 @@ PRODUCT_COPY_FILES := \
@@ -65,15 +67,20 @@ index 3697c49..0bd6bf0 100644
  
  #VNDK config files
  PRODUCT_COPY_FILES += \
-diff --git a/lineage.mk b/lineage.mk
-index 172bb01..f6315b9 100644
---- a/lineage.mk
-+++ b/lineage.mk
-@@ -1,3 +1,4 @@
- $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-+$(call inherit-product, device/lineage/sepolicy/common/sepolicy.mk)
- -include vendor/lineage/build/core/config.mk
- -include vendor/lineage/build/core/apicheck.mk
+diff --git a/generate.sh b/generate.sh
+index b9647b9..66a48a6 100644
+--- a/generate.sh
++++ b/generate.sh
+@@ -65,6 +65,9 @@ for part in a ab;do
+ 				fi
+ 
+ 				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
++				if [ "$1" == "lineage" ];then
++					target="lineage_${target}"
++				fi
+ 
+ 				baseArch="$arch"
+ 				if [ "$arch" = "a64" ];then
 diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 new file mode 100644
 index 0000000..8df673a

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

@@ -1,4 +1,4 @@
-From 0edf02638abc9086f1c5b9264e2429c1bd0fc7eb Mon Sep 17 00:00:00 2001
+From 0150110fafdb657a9074b484be4d7e4e1dd50c95 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

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

@@ -1,4 +1,4 @@
-From 5be43b2a36ba7aefef95e5b3dc624a1d6c8d3e4d Mon Sep 17 00:00:00 2001
+From 882eaf34cd14cbf1c9617498f0318bcaffca8632 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

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

@@ -1,4 +1,4 @@
-From 4a99143b5d49cf82a20f3057d26e7775de6db7d6 Mon Sep 17 00:00:00 2001
+From 53e8034ca13a7e82beeba0f92d75495836ec0061 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