patches: personal: Sync with latest sources of TrebleDroid

Change-Id: I7b41c87e20c78373be24527f00ff291dc07bec3b Signed-off-by: xiaoleGun <1592501605@qq.com>
xiaoleGun · Dec 30, 2023 · a7173b4 · a7173b4
1 parent e1915cb
commit a7173b4
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 80 deletions.
diff --git a/patches/personal/device_phh_treble/0001-treble-Miku-UI-Bringup.patch b/patches/personal/device_phh_treble/0001-treble-Miku-UI-Bringup.patch
@@ -1,4 +1,4 @@
-From 0bb23b7a8b648c7fe5356881b4cefc37dc84b32a Mon Sep 17 00:00:00 2001
+From 5208764b51e87cdbd4efdcb22251192e75a1f82a Mon Sep 17 00:00:00 2001
 From: xiaoleGun <1592501605@qq.com>
 Date: Sun, 6 Feb 2022 14:31:44 +0800
 Subject: [PATCH 01/12] treble: Miku UI Bringup
@@ -15,11 +15,11 @@ Signed-off-by: xiaoleGun <1592501605@qq.com>
  create mode 100644 overlay-miku/packages/apps/Settings/res/values/miku_strings.xml
 
 diff --git a/base.mk b/base.mk
-index b9298a2..55b3678 100644
+index 620fb96..b13b4bf 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -22,7 +22,9 @@ PRODUCT_COPY_FILES += \
- 	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+@@ -18,7 +18,9 @@ PRODUCT_COPY_FILES += \
+     device/phh/treble/bluetooth/audio/config/sysbta_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysbta_audio_policy_configuration_7_0.xml
 
  SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/phh/treble/sepolicy
 -PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay
@@ -97,5 +97,5 @@ index 0000000..15887ba
 +</resources>
 \ No newline at end of file
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/patches/personal/device_phh_treble/0002-treble-sepolicy-fix-honor-v9-no-voice.patch b/patches/personal/device_phh_treble/0002-treble-sepolicy-fix-honor-v9-no-voice.patch
@@ -1,4 +1,4 @@
-From 8c1e339b24394a5324491e51ea89c7a3700436ee Mon Sep 17 00:00:00 2001
+From ba54c31670a954aa83fe60149b70a635f98f0eb1 Mon Sep 17 00:00:00 2001
 From: kindle4jerry <kindle4jerry@gmail.com>
 Date: Sun, 6 Feb 2022 14:42:18 +0800
 Subject: [PATCH 02/12] treble: sepolicy: fix honor v9 no voice
@@ -19,5 +19,5 @@ index beb639a..a0bfa2d 100644
  /system/bin/vndk-detect			u:object_r:vndk_detect_exec:s0
  /system/etc/usb_audio_policy_configuration.xml	u:object_r:vendor_configs_file:s0
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/patches/personal/device_phh_treble/0003-treble-fix-huawei-phone-unkonw-fingerprint.patch b/patches/personal/device_phh_treble/0003-treble-fix-huawei-phone-unkonw-fingerprint.patch
@@ -1,4 +1,4 @@
-From 11f117fcc8d8f44096a4ff24a36faab16a2006de Mon Sep 17 00:00:00 2001
+From 85d4316dab221e4268cf9899c0e4854bdfa536ec Mon Sep 17 00:00:00 2001
 From: kindle4jerry <kindle4jerry@gmail.com>
 Date: Sun, 6 Feb 2022 14:46:06 +0800
 Subject: [PATCH 03/12] treble: fix huawei phone unkonw fingerprint
@@ -9,10 +9,10 @@ Signed-off-by: xiaoleGun <1592501605@qq.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index 5dc493f..57639b2 100644
+index 9a65307..7139434 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -825,7 +825,7 @@ if [ -c /dev/dsm ];then
+@@ -844,7 +844,7 @@ if [ -c /dev/dsm ];then
 
      mkdir -p /data/sec_storage_data
      chown system:system /data/sec_storage_data
@@ -21,7 +21,7 @@ index 5dc493f..57639b2 100644
 
      if mount | grep -q " on /sec_storage " ; then
          # /sec_storage is already mounted by the vendor, don't try to create and mount it
-@@ -833,12 +833,12 @@ if [ -c /dev/dsm ];then
+@@ -852,12 +852,12 @@ if [ -c /dev/dsm ];then
          # the fingerprint daemon (running as system) cannot access it.
          chown -R system:system /sec_storage
          chmod -R 0660 /sec_storage
@@ -37,5 +37,5 @@ index 5dc493f..57639b2 100644
  fi
 
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...reble-Add-Meizu-18-vibrator-support.patch → ...reble-Add-Meizu-18-vibrator-support.patch b/...reble-Add-Meizu-18-vibrator-support.patch → ...reble-Add-Meizu-18-vibrator-support.patch
@@ -1,7 +1,7 @@
-From 674d76bb1b67c21bdea6decad8638b8b440eb5dc Mon Sep 17 00:00:00 2001
+From 54a3aa57ccf7ba8c5e99a247f39b4037cf441254 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 22 Jun 2021 13:38:31 +0000
-Subject: [PATCH 05/12] treble: Add Meizu 18 vibrator support
+Subject: [PATCH 04/12] treble: Add Meizu 18 vibrator support
 
 Thanks to:
 - @phhusson for guidance
@@ -27,10 +27,10 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
  create mode 100644 hal/meizu-vibrator/service.cpp
 
 diff --git a/base.mk b/base.mk
-index 5e64e91..890a105 100644
+index b13b4bf..8dc5b5a 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -239,7 +239,10 @@ PRODUCT_COPY_FILES += \
+@@ -240,7 +240,10 @@ PRODUCT_COPY_FILES += \
  PRODUCT_PACKAGES += phh-ota
 
  PRODUCT_PACKAGES += \
@@ -431,5 +431,5 @@ index cb44422..280ae2d 100644
 +allow hal_vibrator_default vib_strength_sysfs:dir rw_dir_perms;
 +allow hal_vibrator_default vib_strength_sysfs:file rw_file_perms;
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/patches/personal/device_phh_treble/0004-treble-Don-t-handle-apns-conf.patch b/patches/personal/device_phh_treble/0004-treble-Don-t-handle-apns-conf.patch
diff --git a/...Only-use-meizu-vibrator-on-Meizu-18.patch → ...Only-use-meizu-vibrator-on-Meizu-18.patch b/...Only-use-meizu-vibrator-on-Meizu-18.patch → ...Only-use-meizu-vibrator-on-Meizu-18.patch
@@ -1,7 +1,7 @@
-From 5e959ac7305f1f91f5a68c8f27bf18671e4f8f5e Mon Sep 17 00:00:00 2001
+From c3ecfa6e6dfb71d3892c9acffc211b52c3d27582 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 27 Jun 2021 05:21:38 +0000
-Subject: [PATCH 06/12] treble: Only use meizu-vibrator on Meizu 18
+Subject: [PATCH 05/12] treble: Only use meizu-vibrator on Meizu 18
 
 - Convert manifest to VINTF fragment
 - If not the target device, bind to dummy manifest on boot
@@ -76,10 +76,10 @@ index 0000000..b34a10b
 +<manifest version="1.0" type="framework">
 +</manifest>
 diff --git a/rw-system.sh b/rw-system.sh
-index 57639b2..26af4cc 100644
+index 7139434..ae8804d 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -383,6 +383,12 @@ if [ "$foundFingerprint" = false ];then
+@@ -400,6 +400,12 @@ if [ "$foundFingerprint" = false ];then
      mount -o bind system/phh/empty /system/etc/permissions/android.hardware.fingerprint.xml
  fi
 
@@ -93,5 +93,5 @@ index 57639b2..26af4cc 100644
      mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth.xml
      mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth_le.xml
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...e/0007-treble-Support-Miku-UI-gapps.patch → ...e/0006-treble-Support-Miku-UI-gapps.patch b/...e/0007-treble-Support-Miku-UI-gapps.patch → ...e/0006-treble-Support-Miku-UI-gapps.patch
@@ -1,7 +1,7 @@
-From e7020a3fde200cc16eca55d9937cc3724d79248f Mon Sep 17 00:00:00 2001
+From 7c1132d2c0d73038cb3fb73a398d02d95fed519c Mon Sep 17 00:00:00 2001
 From: xiaoleGun <1592501605@qq.com>
 Date: Thu, 10 Feb 2022 09:27:23 +0800
-Subject: [PATCH 07/12] treble: Support Miku UI gapps
+Subject: [PATCH 06/12] treble: Support Miku UI gapps
 
 Signed-off-by: xiaoleGun <1592501605@qq.com>
 ---
@@ -38,5 +38,5 @@ index 15e12a9..e5d0126 100644
 +    phh-overrides
  endif
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...08-treble-import-ota-json-from-gist.patch → ...07-treble-import-ota-json-from-gist.patch b/...08-treble-import-ota-json-from-gist.patch → ...07-treble-import-ota-json-from-gist.patch
@@ -1,7 +1,7 @@
-From 6b379925df4484b0c3b366ed3c00caf8bc9fe38c Mon Sep 17 00:00:00 2001
+From a9a5414bc2099ed106b93532033374d4022de942 Mon Sep 17 00:00:00 2001
 From: xiaoleGun <1592501605@qq.com>
 Date: Fri, 11 Feb 2022 19:27:50 +0800
-Subject: [PATCH 08/12] treble: import ota json from gist
+Subject: [PATCH 07/12] treble: import ota json from gist
 
 ---
  miku.mk | 6 +++++-
@@ -23,5 +23,5 @@ index 5b6dab9..efadf3a 100644
 +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 +	ro.system.ota.json_url=https://gist.githubusercontent.com/xiaoleGun/4e8f9c8473f6a5dd1e261d6edd345a61/raw/cca987a26558b157f1811a7971e1df4ccab6f793/ota.json
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...ble/0009-treble-proper-target-names.patch → ...ble/0008-treble-proper-target-names.patch b/...ble/0009-treble-proper-target-names.patch → ...ble/0008-treble-proper-target-names.patch
@@ -1,14 +1,14 @@
-From f56f9fe24c98f7c366835fb7ce0e87763e5a525f Mon Sep 17 00:00:00 2001
+From eb2615024da3bb98c95648ecfa65ac11a8335de3 Mon Sep 17 00:00:00 2001
 From: xiaoleGun <1592501605@qq.com>
 Date: Sat, 26 Feb 2022 12:01:01 +0800
-Subject: [PATCH 09/12] treble: proper target names
+Subject: [PATCH 08/12] treble: proper target names
 
 ---
  generate.sh | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/generate.sh b/generate.sh
-index 9c20eb5..067e0d6 100644
+index 461eff1..37bc9ad 100644
 --- a/generate.sh
 +++ b/generate.sh
 @@ -65,6 +65,9 @@ for part in a ab;do
@@ -22,5 +22,5 @@ index 9c20eb5..067e0d6 100644
  				baseArch="$arch"
  				if [ "$arch" = "a64" ];then
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...treble-add-offline-charger-sepolicy.patch → ...treble-add-offline-charger-sepolicy.patch b/...treble-add-offline-charger-sepolicy.patch → ...treble-add-offline-charger-sepolicy.patch
@@ -1,7 +1,7 @@
-From 91b33eb6f55d6428a10d4a0e39dd8da437ef8bc6 Mon Sep 17 00:00:00 2001
+From 12b8478048c0b3e3e7be252c7f865d6ef339db7c Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Tue, 15 Sep 2020 21:26:45 -0400
-Subject: [PATCH 10/12] treble: add offline charger sepolicy
+Subject: [PATCH 09/12] treble: add offline charger sepolicy
 
 ---
  sepolicy/gsicharger.te | 1 +
@@ -16,5 +16,5 @@ index 0000000..91cfb5c
 @@ -0,0 +1 @@
 +permissive charger;
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...eble-Revert-Include-sim-toolkit-app.patch → ...eble-Revert-Include-sim-toolkit-app.patch b/...eble-Revert-Include-sim-toolkit-app.patch → ...eble-Revert-Include-sim-toolkit-app.patch
@@ -1,7 +1,7 @@
-From dc6a812579b4b924c45996a912be1a278210762f Mon Sep 17 00:00:00 2001
+From 27f3131c678ba6fcb2fdae1f807632a8a640f2f4 Mon Sep 17 00:00:00 2001
 From: xiaoleGun <1592501605@qq.com>
 Date: Sat, 12 Mar 2022 10:16:33 +0800
-Subject: [PATCH 11/12] treble: Revert "Include sim toolkit app"
+Subject: [PATCH 10/12] treble: Revert "Include sim toolkit app"
 
 This reverts commit 52d4d731465f37e3e8ccf9d315cfc8195303e51f.
 
@@ -11,10 +11,10 @@ Signed-off-by: xiaoleGun <1592501605@qq.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/base.mk b/base.mk
-index 890a105..f286422 100644
+index 8dc5b5a..eaaec3f 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -171,9 +171,6 @@ PRODUCT_PACKAGES += \
+@@ -172,9 +172,6 @@ PRODUCT_PACKAGES += \
  	xiaomi-motor \
  	oneplus-motor
 
@@ -25,5 +25,5 @@ index 890a105..f286422 100644
  	resetprop_phh
 
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...eble/0012-treble-import-via-browser.patch → ...eble/0011-treble-import-via-browser.patch b/...eble/0012-treble-import-via-browser.patch → ...eble/0011-treble-import-via-browser.patch
@@ -1,7 +1,7 @@
-From 1f8196d5a17049f9fda71467148706ff28f7f297 Mon Sep 17 00:00:00 2001
+From 89962d5ca061092dfa66156f85c0de88c2a42e8d Mon Sep 17 00:00:00 2001
 From: xiaoleGun <1592501605@qq.com>
 Date: Sat, 12 Mar 2022 12:45:52 +0800
-Subject: [PATCH 12/12] treble: import via browser
+Subject: [PATCH 11/12] treble: import via browser
 
 Signed-off-by: xiaoleGun <1592501605@qq.com>
 ---
@@ -44,5 +44,5 @@ index 0000000..f2aff85
 +    product_specific: true,
 +}
 -- 
-2.37.1 (Apple Git-137.1)
+2.41.0
 
diff --git a/...es/personal/device_phh_treble/0012-treble-Set-share-dup-blocks-to-reduce-image-size.patch b/...es/personal/device_phh_treble/0012-treble-Set-share-dup-blocks-to-reduce-image-size.patch
@@ -0,0 +1,24 @@
+From 26643a28ecbc8bdb7342f601a4c2644bc0b60799 Mon Sep 17 00:00:00 2001
+From: xiaoleGun <1592501605@qq.com>
+Date: Sat, 30 Dec 2023 14:10:43 +0800
+Subject: [PATCH 12/12] treble: Set share dup blocks to reduce image size
+
+Signed-off-by: xiaoleGun <1592501605@qq.com>
+---
+ miku.mk | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/miku.mk b/miku.mk
+index b934a6f..a113521 100644
+--- a/miku.mk
++++ b/miku.mk
+@@ -20,3 +20,6 @@ else
+ PRODUCT_PACKAGES += \
+     Via
+ endif
++
++# Partitions
++BOARD_EXT4_SHARE_DUP_BLOCKS := true
+-- 
+2.41.0
+