diff --git a/patches_treble/build_make/0002-Revert-mainline_system-Exclude-vendor.lineage.power-.patch b/patches_treble/build_make/0001-Revert-mainline_system-Exclude-vendor.lineage.power-.patch similarity index 87% rename from patches_treble/build_make/0002-Revert-mainline_system-Exclude-vendor.lineage.power-.patch rename to patches_treble/build_make/0001-Revert-mainline_system-Exclude-vendor.lineage.power-.patch index c316227..51dd3a4 100644 --- a/patches_treble/build_make/0002-Revert-mainline_system-Exclude-vendor.lineage.power-.patch +++ b/patches_treble/build_make/0001-Revert-mainline_system-Exclude-vendor.lineage.power-.patch @@ -1,7 +1,7 @@ -From d2ccffcaf2ad6f8b467afb04683677a3271deafa Mon Sep 17 00:00:00 2001 +From 9dd12aff1bdee7020ddd18c4821d390611dc2b5f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 8 Aug 2021 01:43:40 +0000 -Subject: [PATCH 2/2] Revert "mainline_system: Exclude vendor.lineage.power@1.0 +Subject: [PATCH] Revert "mainline_system: Exclude vendor.lineage.power@1.0 from artifact path requirements" This reverts commit 78c28df40f72fdcbe3f82a83828060ad19765fa1. diff --git 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 deleted file mode 100644 index 170bf2a..0000000 --- a/patches_treble/build_make/0001-build-Don-t-handle-apns-conf.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e679bd168b2d45d552e43072f11786f2891358db Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Mon, 5 Oct 2020 01:51:46 +0000 -Subject: [PATCH 1/2] build: Don't handle apns-conf - -Leave it to vendor/lineage instead - -Change-Id: I51fb1436ee0ee2e33b20ca0810b69e827f3f34dc ---- - target/product/aosp_product.mk | 5 ----- - target/product/full_base_telephony.mk | 5 ----- - target/product/mainline.mk | 4 ---- - 3 files changed, 14 deletions(-) - -diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk -index 3e03e6213..1e370fce8 100644 ---- a/target/product/aosp_product.mk -+++ b/target/product/aosp_product.mk -@@ -40,11 +40,6 @@ PRODUCT_PACKAGES += \ - WallpaperPicker \ - - ifeq ($(LINEAGE_BUILD),) --# Telephony: --# Provide a APN configuration to GSI product --PRODUCT_COPY_FILES += \ -- device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml -- - # NFC: - # Provide a libnfc-nci.conf to GSI product - PRODUCT_COPY_FILES += \ -diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk -index 314de3e92..ad46fb97f 100644 ---- a/target/product/full_base_telephony.mk -+++ b/target/product/full_base_telephony.mk -@@ -30,10 +30,5 @@ endif - 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) -diff --git a/target/product/mainline.mk b/target/product/mainline.mk -index 418b1eedd..9754cc8e2 100644 ---- a/target/product/mainline.mk -+++ b/target/product/mainline.mk -@@ -40,7 +40,3 @@ endif - PRODUCT_PACKAGES += \ - PhotoTable \ - WallpaperPicker \ -- --ifeq ($(LINEAGE_BUILD),) --PRODUCT_COPY_FILES += device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml --endif --- -2.25.1 - diff --git a/patches_treble/device_phh_treble/0001-Revert-Update-lineage.mk-for-LineageOS-16.0.patch b/patches_treble/device_phh_treble/0001-Revert-Update-lineage.mk-for-LineageOS-16.0.patch deleted file mode 100644 index fe499ff..0000000 --- a/patches_treble/device_phh_treble/0001-Revert-Update-lineage.mk-for-LineageOS-16.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 13f428e6a81c5bba49ecfe5323b450ddae5025b0 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 8 Aug 2021 01:43:40 +0000 -Subject: [PATCH 1/7] Revert "Update lineage.mk for LineageOS 16.0" - -This reverts commit 82b15278bad816632dcaeaed623b569978e9840d. ---- - lineage.mk | 1 + - 1 file changed, 1 insertion(+) - -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 --- -2.25.1 - diff --git a/patches_treble/device_phh_treble/0001-treble-Proper-target-names-for-LineageOS.patch b/patches_treble/device_phh_treble/0001-treble-Proper-target-names-for-LineageOS.patch new file mode 100644 index 0000000..0a6c204 --- /dev/null +++ b/patches_treble/device_phh_treble/0001-treble-Proper-target-names-for-LineageOS.patch @@ -0,0 +1,27 @@ +From cadb66ad47c20d7f1bc3698e830bbde1ac528ace Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Thu, 18 Nov 2021 02:19:52 +0000 +Subject: [PATCH 1/4] treble: Proper target names for LineageOS + +Change-Id: Ib8c12e98d4e875733f0df7874b3a14370f7166e3 +--- + generate.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/generate.sh b/generate.sh +index c1494c7..1ee98ad 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 +-- +2.25.1 + diff --git a/patches_treble/device_phh_treble/0002-Remove-fsck-SELinux-labels.patch b/patches_treble/device_phh_treble/0002-Remove-fsck-SELinux-labels.patch deleted file mode 100644 index 91f62fc..0000000 --- a/patches_treble/device_phh_treble/0002-Remove-fsck-SELinux-labels.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ecd6a5affd7df4bd9ab4b89472b2cadc15a6aeba Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Wed, 23 Oct 2019 09:38:16 +0000 -Subject: [PATCH 2/7] Remove fsck SELinux labels - -These are covered by LOS sepolicy - -Change-Id: I7c63c9aed39afc07b8c80918053154113f848cd9 ---- - sepolicy/file_contexts | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts -index 7cfb226..7ab5e91 100644 ---- a/sepolicy/file_contexts -+++ b/sepolicy/file_contexts -@@ -6,9 +6,6 @@ - /system/bin/phh-on-data.sh u:object_r:phhsu_exec:s0 - /system/bin/asus-motor u:object_r:phhsu_exec:s0 - --#/system/bin/fsck\.exfat u:object_r:fsck_exec:s0 --/system/bin/fsck\.ntfs u:object_r:fsck_exec:s0 -- - /bt_firmware(/.*)? u:object_r:bt_firmware_file:s0 - - /sec_storage(/.*)? u:object_r:teecd_data_file:s0 --- -2.25.1 - diff --git a/patches_treble/device_phh_treble/0003-treble-Add-overlay-lineage.patch b/patches_treble/device_phh_treble/0002-treble-Lineage-ify.patch similarity index 67% rename from patches_treble/device_phh_treble/0003-treble-Add-overlay-lineage.patch rename to patches_treble/device_phh_treble/0002-treble-Lineage-ify.patch index 3a08e32..2692e37 100644 --- a/patches_treble/device_phh_treble/0003-treble-Add-overlay-lineage.patch +++ b/patches_treble/device_phh_treble/0002-treble-Lineage-ify.patch @@ -1,22 +1,42 @@ -From cceaa8cfab8e6f00b1c0d79f2852f7fb2623b075 Mon Sep 17 00:00:00 2001 -From: AndyCGYan -Date: Mon, 15 Jul 2019 10:43:52 +0000 -Subject: [PATCH 3/7] treble: Add overlay-lineage +From b7e42be7eef0c237ba715e48a9563fb130ace133 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Wed, 23 Oct 2019 09:38:16 +0000 +Subject: [PATCH 2/4] treble: Lineage-ify -Change-Id: I9d313b1488d98acc7cf37d23820946ee99745426 +Squash of: +- Remove fsck SELinux labels +- treble: Add overlay-lineage +- treble: Don't specify config_wallpaperCropperPackage +- treble: Don't handle apns-conf --- - base.mk | 12 ++- + base-pre.mk | 3 - + base.mk | 16 ++-- .../lineage/res/res/values/config.xml | 81 +++++++++++++++++++ - 2 files changed, 90 insertions(+), 3 deletions(-) + .../base/core/res/res/values/config.xml | 1 - + sepolicy/file_contexts | 3 - + 5 files changed, 90 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 +index 6a317e4..e69de29 100644 +--- a/base-pre.mk ++++ b/base-pre.mk +@@ -1,3 +0,0 @@ +-#Use a more decent APN config +-PRODUCT_COPY_FILES += \ +- device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml diff --git a/base.mk b/base.mk -index 43f3707..5d16dbe 100644 +index 301fee9..e8ac0a3 100644 --- a/base.mk +++ b/base.mk -@@ -13,7 +13,13 @@ PRODUCT_COPY_FILES += \ - device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml +@@ -8,12 +8,14 @@ PRODUCT_COPY_FILES := \ + frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ + frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ +-#Use a more decent APN config +-PRODUCT_COPY_FILES += \ +- device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml +- BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy -PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay + @@ -29,7 +49,7 @@ index 43f3707..5d16dbe 100644 $(call inherit-product, vendor/hardware_overlay/overlay.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -@@ -30,11 +36,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +@@ -30,11 +32,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ ro.build.version.security_patch=$(PLATFORM_SECURITY_PATCH) \ ro.adb.secure=0 \ ro.logd.auditd=true @@ -130,6 +150,32 @@ index 0000000..8df673a + config to 7. --> + 127 + +diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml +index 2d5c21e..7a15163 100644 +--- a/overlay/frameworks/base/core/res/res/values/config.xml ++++ b/overlay/frameworks/base/core/res/res/values/config.xml +@@ -22,7 +22,6 @@ + "M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z" + true + +- com.android.wallpaperpicker + true + 5 + true +diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts +index 4ae5095..5e39d5b 100644 +--- a/sepolicy/file_contexts ++++ b/sepolicy/file_contexts +@@ -6,9 +6,6 @@ + /system/bin/phh-on-data.sh u:object_r:phhsu_exec:s0 + /system/bin/asus-motor u:object_r:phhsu_exec:s0 + +-#/system/bin/fsck\.exfat u:object_r:fsck_exec:s0 +-/system/bin/fsck\.ntfs u:object_r:fsck_exec:s0 +- + /bt_firmware(/.*)? u:object_r:bt_firmware_file:s0 + + /sec_storage(/.*)? u:object_r:teecd_data_file:s0 -- 2.25.1 diff --git a/patches_treble/device_phh_treble/0006-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch b/patches_treble/device_phh_treble/0003-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch similarity index 81% rename from patches_treble/device_phh_treble/0006-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch rename to patches_treble/device_phh_treble/0003-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch index 531e76b..1b6ed3a 100644 --- a/patches_treble/device_phh_treble/0006-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch +++ b/patches_treble/device_phh_treble/0003-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch @@ -1,7 +1,7 @@ -From d7b179f234d76c3acf7a723fc05f07efe9adc84c Mon Sep 17 00:00:00 2001 +From 49c33e6e43aa8b2dbd8f02baa6f47a88caf2a3bb Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 8 Aug 2021 09:29:32 +0000 -Subject: [PATCH 6/7] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly +Subject: [PATCH 3/4] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly Change-Id: I725443154fabde548d2e6c1b072d34c27596c421 --- diff --git a/patches_treble/device_phh_treble/0007-add-offline-charger-sepolicy.patch b/patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch similarity index 77% rename from patches_treble/device_phh_treble/0007-add-offline-charger-sepolicy.patch rename to patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch index b9aa9df..fcde59a 100644 --- a/patches_treble/device_phh_treble/0007-add-offline-charger-sepolicy.patch +++ b/patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch @@ -1,7 +1,7 @@ -From 9d0b5acf3e811eb17eb7501dd43ff952ec3b172f Mon Sep 17 00:00:00 2001 +From b47d7218ce7161cb9e81e21e55db013dd9fbcf68 Mon Sep 17 00:00:00 2001 From: Victor Bo Date: Tue, 15 Sep 2020 21:26:45 -0400 -Subject: [PATCH 7/7] add offline charger sepolicy +Subject: [PATCH 4/4] add offline charger sepolicy --- sepolicy/gsicharger.te | 1 + diff --git a/patches_treble/device_phh_treble/0004-treble-Don-t-specify-config_wallpaperCropperPackage.patch b/patches_treble/device_phh_treble/0004-treble-Don-t-specify-config_wallpaperCropperPackage.patch deleted file mode 100644 index 7920bfc..0000000 --- a/patches_treble/device_phh_treble/0004-treble-Don-t-specify-config_wallpaperCropperPackage.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1ab462e2b735ff92e75fc9eef0d62b3b920771f1 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Tue, 10 Sep 2019 02:42:36 +0000 -Subject: [PATCH 4/7] treble: Don't specify config_wallpaperCropperPackage - -Change-Id: I72b59def304779e4bd9a399c01cf1180d15bf444 ---- - overlay/frameworks/base/core/res/res/values/config.xml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml -index 2d5c21e..7a15163 100644 ---- a/overlay/frameworks/base/core/res/res/values/config.xml -+++ b/overlay/frameworks/base/core/res/res/values/config.xml -@@ -22,7 +22,6 @@ - "M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z" - true - -- com.android.wallpaperpicker - true - 5 - true --- -2.25.1 - diff --git a/patches_treble/device_phh_treble/0005-treble-Don-t-handle-apns-conf.patch b/patches_treble/device_phh_treble/0005-treble-Don-t-handle-apns-conf.patch deleted file mode 100644 index 180bc7e..0000000 --- a/patches_treble/device_phh_treble/0005-treble-Don-t-handle-apns-conf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1e5aef82a995e0244b3eb084fca25c7f1eedc324 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 27 Jun 2021 15:37:56 +0000 -Subject: [PATCH 5/7] treble: Don't handle apns-conf - -LineageOS has its own well-maintained copy - -Change-Id: If568101f21098c75879af8b9b6141af179566960 ---- - base-pre.mk | 3 --- - base.mk | 4 ---- - 2 files changed, 7 deletions(-) - -diff --git a/base-pre.mk b/base-pre.mk -index 6a317e4..e69de29 100644 ---- a/base-pre.mk -+++ b/base-pre.mk -@@ -1,3 +0,0 @@ --#Use a more decent APN config --PRODUCT_COPY_FILES += \ -- device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml -diff --git a/base.mk b/base.mk -index 5d16dbe..878aaae 100644 ---- a/base.mk -+++ b/base.mk -@@ -8,10 +8,6 @@ PRODUCT_COPY_FILES := \ - frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ - frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ - --#Use a more decent APN config --PRODUCT_COPY_FILES += \ -- device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml -- - BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy - - PRODUCT_PACKAGE_OVERLAYS += \ --- -2.25.1 -