Skip to content

Commit

Permalink
add patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@imbroglius
imbroglius committed Aug 12, 2024
1 parent b3d116a commit 680bf0e
Show file tree
Hide file tree
Showing 218 changed files with 63,743 additions and 0 deletions.
26 changes: 26 additions & 0 deletions patches/personal/device_phh_treble/0001-Import-vendor-gapps.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 2bf85c385f0e9c41ab6c33cfab114457275db967 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <[email protected]>
Date: Tue, 21 Feb 2023 22:51:12 +0000
Subject: [PATCH 1/3] Import vendor/gapps

---
generate.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/generate.sh b/generate.sh
index 461eff1..4c7690a 100644
--- a/generate.sh
+++ b/generate.sh
@@ -26,7 +26,8 @@ for part in a ab;do
optional_base=""
if [ "$apps" == "gapps" ];then
apps_suffix="g"
- apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
+ [[ "$arch" == "a64" ]] && base="arm" || base="arm64"
+ apps_script="\$(call inherit-product, vendor/gapps/$base/$base-vendor.mk)"
apps_name="with GApps"
fi
if [ "$apps" == "gapps-go" ];then
--
2.34.1

115 changes: 115 additions & 0 deletions patches/personal/device_phh_treble/0002-Rework-securize-tweak.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
From 1423a40a59b5d849e6161a3e7cdf0de003dcbad9 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <[email protected]>
Date: Wed, 25 Dec 2019 12:34:05 +0200
Subject: [PATCH 2/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 22525cd..8c0f2be 100644
--- a/base.mk
+++ b/base.mk
@@ -177,7 +177,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 1e47287..d591190 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -768,32 +768,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
@@ -812,22 +839,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

21 changes: 21 additions & 0 deletions ...ersonal/device_phh_treble/0003-a64-Set-BUILD_BROKEN_MISSING_REQUIRED_MODULES-to-tru.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
From f122a0b9671501c0b45c4251d7217f607e8f8509 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <[email protected]>
Date: Fri, 12 Apr 2024 23:59:25 +0000
Subject: [PATCH 3/3] a64: Set BUILD_BROKEN_MISSING_REQUIRED_MODULES to true

---
tdgsi_a64_ab/BoardConfig.mk | 1 +
1 file changed, 1 insertion(+)

diff --git a/tdgsi_a64_ab/BoardConfig.mk b/tdgsi_a64_ab/BoardConfig.mk
index f131e88..72c4c73 100644
--- a/tdgsi_a64_ab/BoardConfig.mk
+++ b/tdgsi_a64_ab/BoardConfig.mk
@@ -8,3 +8,4 @@ ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
endif
TARGET_USES_64_BIT_BINDER := true
+BUILD_BROKEN_MISSING_REQUIRED_MODULES := true
--
2.34.1

24 changes: 24 additions & 0 deletions patches/personal/platform_build/0001-Remove-su-from-vanilla-builds.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From c046f10027f788fc6645a7d377f0c9e90ce399e6 Mon Sep 17 00:00:00 2001
From: Victor Bo <[email protected]>
Date: Sat, 14 Dec 2019 23:46:34 +0200
Subject: [PATCH 1/2] Remove su from vanilla builds

---
target/product/base_system.mk | 1 -
1 file changed, 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c6ca3dda2c..58d9629a92 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -436,7 +436,6 @@ PRODUCT_PACKAGES_DEBUG := \
ss \
start_with_lockagent \
strace \
- su \
sanitizer-status \
tracepath \
tracepath6 \
--
2.34.1

39 changes: 39 additions & 0 deletions patches/personal/platform_build/0002-product-Exclude-AOSP-apn-list-on-custom-builds.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 32bd5279405b2013c1152338ab79dca6585983b7 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <[email protected]>
Date: Tue, 26 Dec 2023 17:01:46 +0000
Subject: [PATCH 2/2] product: Exclude AOSP apn list on custom builds

Change-Id: I76c8d5ef67de73d4558d350a87a9bc317aaad792
---
target/product/aosp_product.mk | 5 -----
target/product/full_base_telephony.mk | 1 -
2 files changed, 6 deletions(-)

diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
index f72f2dfec4..05bcaefcea 100644
--- a/target/product/aosp_product.mk
+++ b/target/product/aosp_product.mk
@@ -35,8 +35,3 @@ PRODUCT_PACKAGES += \
preinstalled-packages-platform-aosp-product.xml \
ThemePicker \
WallpaperPicker \
-
-# 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
diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
index d8a54cd7f3..5470ad2be5 100644
--- a/target/product/full_base_telephony.mk
+++ b/target/product/full_base_telephony.mk
@@ -24,7 +24,6 @@ PRODUCT_VENDOR_PROPERTIES := \
ro.com.android.dataroaming?=true

PRODUCT_COPY_FILES := \
- device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
--
2.34.1

26 changes: 26 additions & 0 deletions patches/personal/platform_external_robolectric/0001-Fix-Trebuchet-tests.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 758b318b6b46c6f66fa9dfc1b10e5b241a3ccd63 Mon Sep 17 00:00:00 2001
From: Michael Bestas <[email protected]>
Date: Sun, 16 Jun 2024 23:07:27 +0300
Subject: [PATCH] Fix Trebuchet tests

Change-Id: I88830b39a758359445821e2d38a5b27f82a547d7
---
Android.bp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index daef47190..d4c96df6d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -198,7 +198,7 @@ java_host_for_device {
"//frameworks/base/packages/SettingsLib/tests/robotests:__subpackages__",
"//frameworks/base/packages/SettingsLib/Spa/screenshot:__subpackages__",
"//frameworks/base/packages/SystemUI:__pkg__",
- "//packages/apps/Launcher3/tests:__pkg__",
+ "//packages/apps/Trebuchet/tests:__pkg__",
"//frameworks/libs/systemui/animationlib:__pkg__",
"//frameworks/base/tests/InputScreenshotTest:__subpackages__",
"//frameworks/opt/car/setupwizard/library/main/tests/robotests:__pkg__",
--
2.34.1

Loading

0 comments on commit 680bf0e

Please sign in to comment.