From f4ed0dd61ad8cea82dc62eff0601b77590778832 Mon Sep 17 00:00:00 2001 From: j4nn <531585+j4nn@users.noreply.github.com> Date: Sat, 11 Oct 2025 20:09:28 +0200 Subject: [PATCH] initial attempt for 14.1 branch addapt lunch targets and disable twrp decryption that fails to build --- AndroidProducts.mk | 16 ++++++++-------- BoardConfigCommon.mk | 2 +- device.mk | 3 +++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index ab3d1a7..01a3061 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -21,11 +21,11 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/twrp_akatsuki.mk COMMON_LUNCH_CHOICES := \ - twrp_akari-eng \ - twrp_akari-userdebug \ - twrp_apollo-eng \ - twrp_apollo-userdebug \ - twrp_aurora-eng \ - twrp_aurora-userdebug \ - twrp_akatsuki-eng \ - twrp_akatsuki-userdebug + twrp_akari-ap2a-eng \ + twrp_akari-ap2a-userdebug \ + twrp_apollo-ap2a-eng \ + twrp_apollo-ap2a-userdebug \ + twrp_aurora-ap2a-eng \ + twrp_aurora-ap2a-userdebug \ + twrp_akatsuki-ap2a-eng \ + twrp_akatsuki-ap2a-userdebug diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 654927a..2a500f3 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -137,7 +137,7 @@ TW_MAX_BRIGHTNESS := 1023 TW_THEME := portrait_hdpi TW_EXCLUDE_DEFAULT_USB_INIT := true TW_EXTRA_LANGUAGES := true -TW_INCLUDE_CRYPTO := true +#TW_INCLUDE_CRYPTO := true TW_INCLUDE_NTFS_3G := true TW_INCLUDE_PYTHON := true TW_INCLUDE_RESETPROP := true diff --git a/device.mk b/device.mk index d2c90a3..a772bd6 100644 --- a/device.mk +++ b/device.mk @@ -58,6 +58,9 @@ PRODUCT_SOONG_NAMESPACES += \ # Copy modules into initramfs /sbin PRODUCT_COPY_FILES += $(call find-copy-subdir-files,*.ko,$(COMMON_PATH)/prebuilt/modules,$(TARGET_COPY_OUT_RECOVERY)/root/sbin) +# trying to workaround a build failure with 14.1 branch - did not help - copy the file manually there :-( +#PRODUCT_COPY_FILES += $(COMMON_PATH)/recovery/task_profiles.json:$(TARGET_COPY_OUT)/system/etc/task_profiles.json + # Prebuit files for recovery ramdisk PRODUCT_COPY_FILES += \ $(call find-copy-subdir-files,*,$(COMMON_PATH)/recovery/root,$(TARGET_COPY_OUT_RECOVERY)/root)