build/soong/Android.bp

@@ -267,6 +267,23 @@ bootloader_message_offset {
     },
 }
 
+soong_config_module_type {
+    name: "egl_display_array",
+    module_type: "cc_defaults",
+    config_namespace: "lineageGlobalVars",
+    bool_variables: ["uses_egl_display_array"],
+    properties: ["cflags"],
+}
+
+egl_display_array {
+    name: "egl_display_array_defaults",
+    soong_config_variables: {
+        uses_egl_display_array: {
+            cflags: ["-DEGL_DISPLAY_ARRAY"],
+        },
+    },
+}
+
 soong_config_module_type {
     name: "health_charging_control",
     module_type: "cc_defaults",
@@ -342,3 +359,21 @@ powershare {
         },
     },
 }
+
+// NVIDIA specific config modules
+soong_config_module_type {
+    name: "nvidia_enhancements",
+    module_type: "cc_defaults",
+    config_namespace: "lineageNvidiaVars",
+    bool_variables: ["uses_nvidia_enhancements"],
+    properties: ["cppflags"],
+}
+
+nvidia_enhancements {
+    name: "nvidia_enhancements_defaults",
+    soong_config_variables: {
+        uses_nvidia_enhancements: {
+            cppflags: ["-DNV_ANDROID_FRAMEWORK_ENHANCEMENTS"],
+        },
+    },
+}

build/tasks/kernel.mk

@@ -84,8 +84,6 @@ VARIANT_DEFCONFIG := $(TARGET_KERNEL_VARIANT_CONFIG)
 SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG)
 # dtb generation - optional
 TARGET_MERGE_DTBS_WILDCARD ?= *
-# recovery modules.load fallback - optional
-BOARD_RECOVERY_KERNEL_MODULES_LOAD ?= $(BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD)
 
 ## Internal variables
 DTC := $(HOST_OUT_EXECUTABLES)/dtc
@@ -553,7 +551,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULE
 					if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from RECOVERY_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \
 				done); \
 				[ $$? -ne 0 ] && exit 1; \
-				($(call build-image-kernel-modules-lineage,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_KERNEL_MODULES_LOAD),,,)) || exit "$$?"; \
+				($(call build-image-kernel-modules-lineage,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD),,,)) || exit "$$?"; \
 			) \
 		fi
 
@@ -656,7 +654,7 @@ ifeq ($(BOARD_USES_QCOM_MERGE_DTBS_SCRIPT),true)
 	$(hide) find $(DTBS_OUT) -type f -name "*.dtb*" | xargs rm -f
 	mv $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtb $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtbo $(DTBS_BASE)/
 	PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/lineage/build/tools/merge_dtbs.py --base $(DTBS_BASE) --techpack $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom --out $(DTBS_OUT)
-	cat $(shell find $(DTBS_OUT) -type f -name "${TARGET_MERGE_DTBS_WILDCARD}.dtb" | sort) > $@
+	cat $(shell find $(DTB_OUT)/out -type f -name "${TARGET_MERGE_DTBS_WILDCARD}.dtb" | sort) > $@
 else
 	cat $(shell find $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtb" | sort) > $@
 endif # BOARD_USES_QCOM_MERGE_DTBS_SCRIPT

config/BoardConfigSoong.mk

@@ -49,18 +49,25 @@ SOONG_CONFIG_lineageGlobalVars += \
     target_surfaceflinger_udfps_lib \
     target_trust_usb_control_path \
     target_trust_usb_control_enable \
-    target_trust_usb_control_disable
+    target_trust_usb_control_disable \
+    uses_egl_display_array
 
 ifneq ($(TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH),)
 SOONG_CONFIG_lineageGlobalVars += \
     target_health_charging_control_charging_path
 endif
 
+SOONG_CONFIG_NAMESPACES += lineageNvidiaVars
+SOONG_CONFIG_lineageNvidiaVars += \
+    uses_nvidia_enhancements
+
 # Soong bool variables
 SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED)
 SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_custom_content_md_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE)
 SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE)
 SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_ubwcp_format := $(TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT)
+SOONG_CONFIG_lineageGlobalVars_uses_egl_display_array := $(TARGET_USES_EGL_DISPLAY_ARRAY)
+SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
 
 # Set default values
 BOOTLOADER_MESSAGE_OFFSET ?= 0

config/common.mk

@@ -1,6 +1,5 @@
 # Allow vendor/extra to override any property by setting it first
 $(call inherit-product-if-exists, vendor/extra/product.mk)
-$(call inherit-product, vendor/lineage/config/scoop.mk)
 
 PRODUCT_BRAND ?= LineageOS
 
@@ -240,11 +239,9 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 endif
 
 # SetupWizard
-ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     setupwizard.theme=glif_v4 \
     setupwizard.feature.day_night_mode_enabled=true
-endif
 
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro
 PRODUCT_PACKAGE_OVERLAYS += \
@@ -271,8 +268,7 @@ PRODUCT_EXTRA_RECOVERY_KEYS += \
 
 include vendor/lineage/config/version.mk
 
-# -include vendor/lineage-priv/keys/keys.mk
+-include vendor/lineage-priv/keys/keys.mk
+
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
 -include vendor/lineage/config/partner_gms.mk
-
-#$(call inherit-product, vendor/lineage/config/scoop.mk)

config/common_mobile.mk

@@ -9,11 +9,9 @@ include vendor/lineage/config/aosp_audio.mk
 include vendor/lineage/config/lineage_audio.mk
 
 # Default notification/alarm sounds
-ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.notification_sound=Argon.ogg \
     ro.config.alarm_alert=Hassium.ogg
-endif
 
 # Apps
 PRODUCT_PACKAGES += \

config/scoop.mk

@@ -1,16 +0,0 @@
-# Pif
-PRODUCT_PRODUCT_PROPERTIES += \
-    persist.sys.pihooks_BRAND?=google \
-    persist.sys.pihooks_MANUFACTURER?=Google \
-    persist.sys.pihooks_DEVICE?=oriole \
-    persist.sys.pihooks_PRODUCT?=oriole_beta \
-    persist.sys.pihooks_DEVICE_INITIAL_SDK_INT?=21 \
-    persist.sys.pihooks_SECURITY_PATCH?=2025-03-05 \
-    persist.sys.pihooks_ID?=BP22.250221.015 \
-    persist.sys.pihooks_FINGERPRINT?=google/oriole_beta/oriole:16/BP22.250221.015/13278879:user/release-keys \
-    persist.sys.pihooks_MODEL?=Pixel 6
-
-#BUILD_GMS_OVERLAYS_AND_PROPS := true
-$(call inherit-product, vendor/gms/products/gms.mk)
-
--include vendor/lineage-priv/keys/keys.mk

config/telephony.mk

@@ -17,10 +17,8 @@ PRODUCT_PACKAGES += \
     Stk
 
 # Default ringtone
-ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=Orion.ogg
-endif
 
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)

prebuilt/common/etc/init/init.lineage-system_ext.rc

@@ -4,9 +4,6 @@ on init
 
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -p -z
-    socket dumpstate stream 0660 shell log
-    class main
-    user root
-    disabled
     oneshot
+    disabled
     keycodes 114 115 116

product/nvidia.mk

@@ -16,4 +16,3 @@
 # Includes support for:
 # 1) NvCPL / Application Profiles
 NV_ANDROID_FRAMEWORK_ENHANCEMENTS := true
-$(call soong_config_set,NV_ANDROID,FRAMEWORK_ENHANCEMENTS,true)

vars/qcom

@@ -1,6 +1,6 @@
 declare -A qcom_group_revision
 # https://git.codelinaro.org/clo/la/platform/frameworks/base/-/tags?sort=updated_desc&search=LA.QSSI.15.0.r1
-qcom_group_revision[qssi]=LA.QSSI.15.0.r1-14500-qssi.0
+qcom_group_revision[qssi]=LA.QSSI.15.0.r1-13000-qssi.0
 # https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio/-/tags?sort=updated_desc&search=LA.UM.10.6.2.r1
 qcom_group_revision[msm8953]=LA.UM.10.6.2.r1-02500-89xx.0
 # https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio/-/tags?sort=updated_desc&search=LA.UM.12.2.1.r1
@@ -12,16 +12,16 @@ qcom_group_revision[msmnile]=LA.UM.9.1.r1-16400-SMxxx0.QSSI14.0
 # https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio/-/tags?sort=updated_desc&search=LA.UM.9.12.r1
 qcom_group_revision[kona]=LA.UM.9.12.r1-18500-SMxx50.QSSI14.0
 # https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio/-/tags?sort=updated_desc&search=LA.UM.9.14.r1
-qcom_group_revision[lahaina]=LA.UM.9.14.r1-26000-LAHAINA.QSSI15.0
+qcom_group_revision[lahaina]=LA.UM.9.14.r1-25500-LAHAINA.QSSI15.0
 # https://git.codelinaro.org/clo/la/device/qcom/sepolicy_vndr/-/tags?sort=updated_desc&search=LA.VENDOR.1.0.r1
-qcom_group_revision[waipio-vendor]=LA.VENDOR.1.0.r1-27000-WAIPIO.QSSI15.0
+qcom_group_revision[waipio-vendor]=LA.VENDOR.1.0.r1-26900-WAIPIO.QSSI15.0
 # https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio-ar/-/tags?sort=updated_desc&search=AUDIO.LA.8.0.r1
-qcom_group_revision[kailua-audio]=AUDIO.LA.8.0.r1-12300-KAILUA.0
+qcom_group_revision[kailua-audio]=AUDIO.LA.8.0.r1-12100-KAILUA.0
 # https://git.codelinaro.org/clo/la/device/qcom/sepolicy_vndr/-/tags?sort=updated_desc&search=LA.VENDOR.13.2.0.r1
-qcom_group_revision[kailua-vendor]=LA.VENDOR.13.2.0.r1-26600-KAILUA.QSSI16.0
+qcom_group_revision[kailua-vendor]=LA.VENDOR.13.2.0.r1-25900-KAILUA.QSSI15.0
 # https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio-ar/-/tags?sort=updated_desc&search=AUDIO.LA.9.0.r1
-qcom_group_revision[lanai-audio]=AUDIO.LA.9.0.r1-08300-lanai.0
+qcom_group_revision[lanai-audio]=AUDIO.LA.9.0.r1-07900-lanai.0
 # https://git.codelinaro.org/clo/la/device/qcom/sepolicy_vndr/-/tags?sort=updated_desc&search=LA.VENDOR.14.3.0.r1
-qcom_group_revision[lanai-vendor]=LA.VENDOR.14.3.0.r1-19700-lanai.QSSI15.0
+qcom_group_revision[lanai-vendor]=LA.VENDOR.14.3.0.r1-18500-lanai.0
 # https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wfd-commonsys/-/tags?sort=updated_desc&search=VIDEO.LA.4.0.r2
-qcom_group_revision[lanai-video]=VIDEO.LA.4.0.r2-07300-lanai.0
+qcom_group_revision[lanai-video]=VIDEO.LA.4.0.r2-06900-lanai.0