Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc3f48d authored Feb 24, 2025 by Nishith Khanna

Merge remote-tracking branch 'origin/lineage-22.1' into a15

parents b0d79028 e12f0132

core/board_config.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,7 @@ endif
		$(call dump-phase-start,BOARD,,,, build/make/core/board_config.mk)
		ifndef RBC_PRODUCT_CONFIG
		include $(board_config_mk)
		-include vendor/extra/BoardConfigExtra.mk
		else
		$(shell mkdir -p $(OUT_DIR)/rbc)
		$(call dump-variables-rbc, $(OUT_DIR)/rbc/make_vars_pre_board_config.mk)

core/config.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -453,7 +453,6 @@ endif
		# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS
		FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)

		-include vendor/extra/BoardConfigExtra.mk
		ifneq ($(LINEAGE_BUILD),)
		include vendor/lineage/config/BoardConfigLineage.mk
		endif

core/sysprop.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,8 @@ endif
		# when the target-files is signed in a post-build step.
		ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
		BUILD_KEYS := test-keys
		else ifneq ($(filter vendor/lineage-priv/%,$(DEFAULT_SYSTEM_DEV_CERTIFICATE)),)
		BUILD_KEYS := release-keys
		else
		BUILD_KEYS := dev-keys
		endif