Sync with latest sources of TrebleDroid

apply-patches.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+patches="$(readlink -f -- $1)"
+tree="$2"
+
+for project in $(cd $patches/patches/$tree; echo *); do
+    p="$(tr _ / <<<$project |sed -e 's;platform/;;g')"
+    [ "$p" == build ] && p=build/make
+    [ "$p" == treble/app ] && p=treble_app
+    [ "$p" == vendor/hardware/overlay ] && p=vendor/hardware_overlay
+    pushd $p &>/dev/null
+    for patch in $patches/patches/$tree/$project/*.patch; do
+        git am $patch || exit
+    done
+    popd &>/dev/null
+done

derp.mk

@@ -1,40 +1,18 @@
+$(call inherit-product, vendor/derp/config/common_full_phone.mk)
 $(call inherit-product, vendor/derp/config/common.mk)
-$(call inherit-product, vendor/derp/config/BoardConfigSoong.mk)
 $(call inherit-product, vendor/derp/config/BoardConfigDerpFest.mk)
+$(call inherit-product, vendor/derp/config/BoardConfigSoong.mk)
 $(call inherit-product, device/derp/sepolicy/common/sepolicy.mk)
 -include vendor/derp/build/core/config.mk
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-# Inherit some common derp stuff
-$(call inherit-product, vendor/derp/config/common_full_phone.mk)
+
+TARGET_HAS_FUSEBLK_SEPOLICY_ON_VENDOR := true
+TARGET_USES_PREBUILT_VENDOR_SEPOLICY := true
+SELINUX_IGNORE_NEVERALLOWS := true
 
 TARGET_NO_KERNEL_OVERRIDE := true
 TARGET_NO_KERNEL_IMAGE := true
-SELINUX_IGNORE_NEVERALLOWS := true
-TARGET_BOOT_ANIMATION_RES := 1080
-
-TARGET_USES_PREBUILT_VENDOR_SEPOLICY := true
-TARGET_HAS_FUSEBLK_SEPOLICY_ON_VENDOR := true
 
 TARGET_FACE_UNLOCK_SUPPORTED := true
-
-
-# Use CCache
-USE_CCACHE := true
-
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-	persist.sys.binary_xml=false \
-	dalvik.vm.dex2oat64.enabled=true \
-
-# Google Camera Lite
-PRODUCT_PACKAGES += \
-       GoogleCameraGo
-
-
-# Set Bootanimation at 720P
-TARGET_BOOT_ANIMATION_RES := 720
-
-# APN
-PRODUCT_PACKAGES += apns-conf.xml
+TARGET_BOOT_ANIMATION_RES := 1080
+USE_LEGACY_BOOTANIMATION := true
+EXTRA_UDFPS_ANIMATIONS := true

manifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project name="TrebleDroid/device_phh_treble" path="device/phh/treble" remote="github" revision="android-13.0" />
+  <project name="TrebleDroid/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
+  <project name="TrebleDroid/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-13.0" />
+  <project name="TrebleDroid/treble_app" path="treble_app" remote="github" revision="master" />
+  <project name="AndyCGYan/android_packages_apps_QcRilAm" path="packages/apps/QcRilAm" remote="github" revision="master" />
+  <project name="KoysX/android_packages_apps_CameraGo" path="packages/apps/CameraGo" remote="github" revision="original" />
+</manifest>

patches/misc/platform_build_make/0001-Remove-duplicate-apn.patch

@@ -0,0 +1,48 @@
+From 6c1cedf468dc45bce3ab7863edd76936d1780312 Mon Sep 17 00:00:00 2001
+From: TheAtt1la <alittauwu@gmail.com>
+Date: Sun, 4 Dec 2022 18:16:22 -0300
+Subject: [PATCH 1/2] Remove duplicate apn
+
+---
+ target/product/aosp_product.mk        | 8 ++++----
+ target/product/full_base_telephony.mk | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
+index 5c1b1dd..a784b58 100644
+--- a/target/product/aosp_product.mk
++++ b/target/product/aosp_product.mk
+@@ -36,7 +36,7 @@ PRODUCT_PACKAGES += \
+
+ # Telephony:
+ #   Provide a APN configuration to GSI product
+-ifeq ($(DERP_BUILD),)
+-PRODUCT_COPY_FILES += \
+-    device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
+-endif
++#ifeq ($(DERP_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 740c9b2..31bcc96 100644
+--- a/target/product/full_base_telephony.mk
++++ b/target/product/full_base_telephony.mk
+@@ -26,10 +26,10 @@ 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 ($(DERP_BUILD),)
+-PRODUCT_COPY_FILES += \
+-    device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+-endif
++#ifeq ($(DERP_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.38.1
+

patches/misc/platform_build_make/0002-Remove-duplicated-adb.patch

@@ -0,0 +1,32 @@
+From 58710ae30278e99ac86b5a1378fbb42ebb97ace8 Mon Sep 17 00:00:00 2001
+From: naz664 <nazimnavas145@gmail.com>
+Date: Sat, 17 Sep 2022 11:57:42 +0000
+Subject: [PATCH 2/2] Remove duplicated adb
+
+Change-Id: I2cd0c6e9933e21796ad273b5d3ffdc289bd1cbb5
+---
+ core/main.mk | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/core/main.mk b/core/main.mk
+index df803b789..2b75ede21 100644
+--- a/core/main.mk
++++ b/core/main.mk
+@@ -378,13 +378,9 @@ enable_target_debugging := true
+ tags_to_install :=
+ ifneq (,$(user_variant))
+   # Target is secure in user builds.
+-  ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1
++#  ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1
+   ADDITIONAL_SYSTEM_PROPERTIES += security.perf_harden=1
+
+-  ifeq ($(user_variant),user)
+-    ADDITIONAL_SYSTEM_PROPERTIES += ro.adb.secure=1
+-  endif
+-
+   ifeq ($(user_variant),userdebug)
+     # Pick up some extra useful tools
+     tags_to_install += debug
+-- 
+2.25.1
+

patches/misc/platform_build_make/0003-slim-app.patch

@@ -0,0 +1,27 @@
+From fa3690ebe05b7a6ff452127165e8036b4fb5f2cc Mon Sep 17 00:00:00 2001
+From: KoysX <2685697179b@gmail.com>
+Date: Thu, 20 Jul 2023 10:42:43 +0800
+Subject: [PATCH] slim-app
+
+---
+ target/product/handheld_product.mk | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk
+index 2dd1d7f..73ff3d4 100644
+--- a/target/product/handheld_product.mk
++++ b/target/product/handheld_product.mk
+@@ -22,10 +22,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
+
+ # /product packages
+ PRODUCT_PACKAGES += \
+-    Calendar \
+     Contacts \
+     DeskClock \
+-    Gallery2 \
+     Music \
+     OneTimeInitializer \
+     preinstalled-packages-platform-handheld-product.xml \
+-- 
+2.34.1
+

patches/misc/platform_device_derp_sepolicy/0001-Nuke-fuseblk-sepolicy.patch

@@ -0,0 +1,24 @@
+From 5a09cfd89a6e836464028b8226e5836613d143cb Mon Sep 17 00:00:00 2001
+From: ChonDoit <thphantomblog@gmail.com>
+Date: Mon, 14 Nov 2022 23:44:41 +0000
+Subject: [PATCH] Nuke fuseblk sepolicy
+
+Leads to bootloop due alredy exist on vendor
+---
+ common/private/genfs_contexts | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/common/private/genfs_contexts b/common/private/genfs_contexts
+index c629305..a9930bb 100644
+--- a/common/private/genfs_contexts
++++ b/common/private/genfs_contexts
+@@ -1,5 +1,2 @@
+-ifelse(board_excludes_fuseblk_sepolicy, `true', ,
+-genfscon fuseblk / u:object_r:vfat:s0
+-)
+-
++# Placebo line to avoid patch fail
+ genfscon sysfs /devices/virtual/timed_output/vibrator u:object_r:sysfs_vibrator:s0
+-- 
+2.34.1
+

patches/misc/platform_device_phh_treble/0001-treble-Don-t-handle-apns-conf.patch

@@ -0,0 +1,39 @@
+From 1e5aef82a995e0244b3eb084fca25c7f1eedc324 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 27 Jun 2021 15:37:56 +0000
+Subject: [PATCH 2/3] treble: Don't handle apns-conf
+
+Evolution X 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 ce2f218..8c53fa5 100644
+--- a/base.mk
++++ b/base.mk
+@@ -17,10 +17,6 @@ PRODUCT_COPY_FILES += \
+     device/phh/treble/bluetooth/audio/config/sysbta_audio_policy_configuration.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysbta_audio_policy_configuration.xml \
+     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
+
+-#Use a more decent APN config
+-PRODUCT_COPY_FILES += \
+-	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+-
+ SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/phh/treble/sepolicy
+ PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay
+
+-- 
+2.25.1
+

patches/misc/platform_device_phh_treble/0002-Modify-SYSBTA-disabled-behaviour.patch

@@ -0,0 +1,29 @@
+From 7fdbfe272312df29db1bf00b5e7251c19537431f Mon Sep 17 00:00:00 2001
+From: ChonDoit <thphantomblog@gmail.com>
+Date: Wed, 3 May 2023 01:21:40 +0000
+Subject: [PATCH] Modify SYSBTA behaviour while is disabled
+
+---
+ phh-prop-handler.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
+index 24056e4..78c0e3b 100644
+--- a/phh-prop-handler.sh
++++ b/phh-prop-handler.sh
+@@ -221,9 +221,9 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
+         setprop persist.bluetooth.a2dp_offload.disabled true
+         resetprop_phh ro.bluetooth.a2dp_offload.supported false
+     else
+-        resetprop_phh --delete persist.bluetooth.bluetooth_audio_hal.disabled
+-        resetprop_phh --delete persist.bluetooth.a2dp_offload.disabled
+-        resetprop_phh --delete ro.bluetooth.a2dp_offload.supported
++        resetprop_phh --delete persist.bluetooth.bluetooth_audio_hal.disabled
++        resetprop_phh persist.bluetooth.a2dp_offload.disabled
++        resetprop_phh ro.bluetooth.a2dp_offload.supported
+     fi
+     restartAudio
+     exit
+-- 
+2.34.1
+

patches/misc/platform_device_phh_treble/0003-Rework-securize-tweak.patch

@@ -0,0 +1,115 @@
+From 2975460eef8a8f76ca1598b68cbc23d1d0f67a2c Mon Sep 17 00:00:00 2001
+From: Alberto Ponces <ponces26@gmail.com>
+Date: Wed, 25 Dec 2019 12:34:05 +0200
+Subject: [PATCH 1/3] Rework securize tweak
+
+---
+ base.mk      |  1 -
+ rw-system.sh | 49 ++++++++++++++++++++++++++++++-------------------
+ 2 files changed, 30 insertions(+), 20 deletions(-)
+
+diff --git a/base.mk b/base.mk
+index b9298a2..32a797f 100644
+--- a/base.mk
++++ b/base.mk
+@@ -180,7 +180,6 @@ PRODUCT_PACKAGES += \
+ 	resetprop_phh
+
+ PRODUCT_COPY_FILES += \
+-	device/phh/treble/phh-securize.sh:system/bin/phh-securize.sh \
+ 	device/phh/treble/files/ota.sh:system/bin/ota.sh \
+
+ PRODUCT_COPY_FILES += \
+diff --git a/rw-system.sh b/rw-system.sh
+index 9a90a29..f178bd1 100644
+--- a/rw-system.sh
++++ b/rw-system.sh
+@@ -739,32 +739,59 @@ copyprop() {
+         resetprop_phh "$1" "$(getprop "$2")"
+     fi
+ }
+-if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+     copyprop ro.build.device ro.vendor.build.device
+     copyprop ro.system.build.fingerprint ro.vendor.build.fingerprint
+     copyprop ro.bootimage.build.fingerprint ro.vendor.build.fingerprint
+     copyprop ro.build.fingerprint ro.vendor.build.fingerprint
++    copyprop ro.system_ext.build.fingerprint ro.vendor.build.fingerprint
++    copyprop ro.product.build.fingerprint ro.vendor.build.fingerprint
+     copyprop ro.build.device ro.vendor.product.device
+     copyprop ro.product.system.device ro.vendor.product.device
+     copyprop ro.product.device ro.vendor.product.device
+     copyprop ro.product.system.device ro.product.vendor.device
+     copyprop ro.product.device ro.product.vendor.device
++    copyprop ro.product.system_ext.device ro.vendor.product.device
++    copyprop ro.product.product.device ro.vendor.product.device
++    copyprop ro.product.system_ext.device ro.product.vendor.device
++    copyprop ro.product.product.device ro.product.vendor.device
+     copyprop ro.product.system.name ro.vendor.product.name
+     copyprop ro.product.name ro.vendor.product.name
+-    copyprop ro.product.system.name ro.product.vendor.device
+-    copyprop ro.product.name ro.product.vendor.device
++    copyprop ro.product.system.name ro.product.vendor.name
++    copyprop ro.product.name ro.product.vendor.name
++    copyprop ro.product.system_ext.name ro.vendor.product.name
++    copyprop ro.product.product.name ro.vendor.product.name
++    copyprop ro.product.system_ext.name ro.product.vendor.name
++    copyprop ro.product.product.name ro.product.vendor.name
+     copyprop ro.system.product.brand ro.vendor.product.brand
+     copyprop ro.product.brand ro.vendor.product.brand
++    copyprop ro.product.system.brand ro.vendor.product.brand
++    copyprop ro.product.system_ext.brand ro.vendor.product.brand
++    copyprop ro.product.product.brand ro.product.vendor.brand
++    copyprop ro.system.product.brand ro.product.vendor.brand
++    copyprop ro.product.brand ro.product.vendor.brand
++    copyprop ro.product.system.brand ro.product.vendor.brand
++    copyprop ro.product.system_ext.brand ro.product.vendor.brand
++    copyprop ro.product.product.brand ro.product.vendor.brand
+     copyprop ro.product.system.model ro.vendor.product.model
+     copyprop ro.product.model ro.vendor.product.model
++    copyprop ro.product.system_ext.model ro.vendor.product.model
++    copyprop ro.product.product.model ro.vendor.product.model
+     copyprop ro.product.system.model ro.product.vendor.model
+     copyprop ro.product.model ro.product.vendor.model
+     copyprop ro.build.product ro.vendor.product.model
+     copyprop ro.build.product ro.product.vendor.model
++    copyprop ro.product.system_ext.model ro.product.vendor.model
++    copyprop ro.product.product.model ro.product.vendor.model
+     copyprop ro.system.product.manufacturer ro.vendor.product.manufacturer
+     copyprop ro.product.manufacturer ro.vendor.product.manufacturer
++    copyprop ro.product.system.manufacturer ro.vendor.product.manufacturer
++    copyprop ro.product.product.manufacturer ro.vendor.product.manufacturer
++    copyprop ro.product.system_ext.manufacturer ro.vendor.product.manufacturer
+     copyprop ro.system.product.manufacturer ro.product.vendor.manufacturer
+     copyprop ro.product.manufacturer ro.product.vendor.manufacturer
++    copyprop ro.product.system.manufacturer ro.product.vendor.manufacturer
++    copyprop ro.product.product.manufacturer ro.product.vendor.manufacturer
++    copyprop ro.product.system_ext.manufacturer ro.product.vendor.manufacturer
+     (getprop ro.vendor.build.security_patch; getprop ro.keymaster.xxx.security_patch) |sort |tail -n 1 |while read v;do
+         [ -n "$v" ] && resetprop_phh ro.build.version.security_patch "$v"
+     done
+@@ -783,22 +810,6 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+
+     resetprop_phh ro.adb.secure 1
+
+-    # Hide system/xbin/su
+-    mount /mnt/phh/empty_dir /system/xbin
+-    mount /mnt/phh/empty_dir /system/app/me.phh.superuser
+-    mount /system/phh/empty /system/xbin/phh-su
+-else
+-    mkdir /mnt/phh/xbin
+-    chmod 0755 /mnt/phh/xbin
+-    chcon u:object_r:system_file:s0 /mnt/phh/xbin
+-
+-    #phh-su will bind over this empty file to make a real su
+-    touch /mnt/phh/xbin/su
+-    chcon u:object_r:system_file:s0 /mnt/phh/xbin/su
+-
+-    mount -o bind /mnt/phh/xbin /system/xbin
+-fi
+-
+ for abi in "" 64;do
+     f=/vendor/lib$abi/libstagefright_foundation.so
+     if [ -f "$f" ];then
+-- 
+2.34.1
+