Changes for December 2021

2021-12-06 16:19:39 +00:00
parent 211d0a69c8
commit 463b837c1b
102 changed files with 791 additions and 510 deletions
--- a/patches_treble/build_make/0001-Remove-init.vndk-nodef.rc.patch
+++ b/patches_treble/build_make/0001-Remove-init.vndk-nodef.rc.patch
@@ -0,0 +1,76 @@
+From ff787114856cc9ccb057cf524e7089f7aed558cc 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
+
+This partially reverts "Deprecate VNDK-lite support from Legacy GSI".
+
+Paired with https://github.com/LineageOS/android_system_core/commit/0b265e35ddf42638fa807f5349a10c40e3d46446, it kicks permissive devices into bootloader.
+Given that GSI+permissive won't ever be a Lineage official scenario, revert this only on our side.
+Thanks @Kethen for the insight!
+
+Change-Id: I7c14fe5229e953f620bb225fa5c981752d0ac5f9
+---
+ target/product/gsi/Android.mk         | 12 ------------
+ target/product/gsi/init.gsi.rc        |  2 --
+ target/product/gsi/init.vndk-nodef.rc |  3 ---
+ target/product/gsi_release.mk         |  3 +--
+ 4 files changed, 1 insertion(+), 19 deletions(-)
+ delete mode 100644 target/product/gsi/init.vndk-nodef.rc
+
+diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
+index cb4fdcb33..f2c0f212c 100644
+--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
+@@ -228,15 +228,3 @@ LOCAL_SYSTEM_EXT_MODULE := true
+ LOCAL_MODULE_RELATIVE_PATH := init
+ 
+ include $(BUILD_PREBUILT)
+-
+-
+-include $(CLEAR_VARS)
+-LOCAL_MODULE := init.vndk-nodef.rc
+-LOCAL_LICENSE_KINDS := legacy_restricted
+-LOCAL_LICENSE_CONDITIONS := restricted
+-LOCAL_SRC_FILES := $(LOCAL_MODULE)
+-LOCAL_MODULE_CLASS := ETC
+-LOCAL_SYSTEM_EXT_MODULE := true
+-LOCAL_MODULE_RELATIVE_PATH := init
+-
+-include $(BUILD_PREBUILT)
+diff --git a/target/product/gsi/init.gsi.rc b/target/product/gsi/init.gsi.rc
+index f48284322..c6faba78d 100644
+--- a/target/product/gsi/init.gsi.rc
+++ b/target/product/gsi/init.gsi.rc
+@@ -1,5 +1,3 @@
+ #
+ # Android init script for GSI required initialization
+ #
+-
+-import /system/system_ext/etc/init/init.vndk-${ro.vndk.version:-nodef}.rc
+diff --git a/target/product/gsi/init.vndk-nodef.rc b/target/product/gsi/init.vndk-nodef.rc
+deleted file mode 100644
+index efeef117b..000000000
+--- a/target/product/gsi/init.vndk-nodef.rc
+++ /dev/null
+@@ -1,3 +0,0 @@
+-on early-init
+-    # 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
+--- 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
+ # GSI specific tasks on boot
+ PRODUCT_PACKAGES += \
+     gsi_skip_mount.cfg \
+-    init.gsi.rc \
+-    init.vndk-nodef.rc \
+    init.gsi.rc
+ 
+ # Support additional P, Q and R VNDK packages
+ PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30
+-- 
+2.25.1
+
--- a/patches_treble/build_make/0001-build-Don-t-handle-apns-conf.patch
+++ b/patches_treble/build_make/0001-build-Don-t-handle-apns-conf.patch
@@ -1,46 +0,0 @@
-From 3b33cbc0f0f6642bcb609a3d88e516452147debe Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Mon, 5 Oct 2020 01:51:46 +0000
-Subject: [PATCH] build: Don't handle apns-conf
-
-Leave it to vendor/lineage instead
-
-Change-Id: I51fb1436ee0ee2e33b20ca0810b69e827f3f34dc
---
- target/product/aosp_product.mk        | 7 -------
- target/product/full_base_telephony.mk | 5 -----
- 2 files changed, 12 deletions(-)
-
-diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
-index b41c35fb7..bdaa57aac 100644
--- a/target/product/aosp_product.mk
-+++ b/target/product/aosp_product.mk
-@@ -37,10 +37,3 @@ PRODUCT_PACKAGES += \
-     PhotoTable \
-     preinstalled-packages-platform-aosp-product.xml \
-     WallpaperPicker \
-
-# Telephony:
-#   Provide a APN configuration to GSI product
-ifeq ($(LINEAGE_BUILD),)
-PRODUCT_COPY_FILES += \
-    device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
-endif
-diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
-index e4f5a162b..5470ad2be 100644
--- a/target/product/full_base_telephony.mk
-+++ b/target/product/full_base_telephony.mk
-@@ -26,10 +26,5 @@ PRODUCT_VENDOR_PROPERTIES := \
- PRODUCT_COPY_FILES := \
-     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
- 
-ifeq ($(LINEAGE_BUILD),)
-PRODUCT_COPY_FILES += \
-    device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
-endif
-
- $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
- $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
-- 
-2.25.1
-
--- a/patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
+++ b/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
--- a/patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
+++ b/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
--- a/patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
+++ b/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
--- a/patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch
+++ b/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