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

Commit c8a08bd7 authored Dec 03, 2024 by Treehugger Robot Committed by Automerger Merge Worker Dec 03, 2024

Merge "Export recovery partition related variables to Soong" into main am: fb7aab01

Original change: https://android-review.googlesource.com/c/platform/build/+/3387141

Change-Id: Id64fe8661f50638fe40aa3834c44d00ee46c1ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 0e17c5d3 fb7aab01

core/Makefile

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2936,6 +2936,9 @@ ifneq ($(BOARD_NAND_SPARE_SIZE),)
	$(error MTD device is no longer supported and thus BOARD_NAND_SPARE_SIZE is deprecated.)		$(error MTD device is no longer supported and thus BOARD_NAND_SPARE_SIZE is deprecated.)
	endif		endif

			recovery_intermediates := $(call intermediates-dir-for,PACKAGING,recovery)
			$(eval $(call write-partition-file-list,$(recovery_intermediates)/file_list.txt,$(TARGET_RECOVERY_OUT),$(INTERNAL_RECOVERYIMAGE_FILES)))


	# -----------------------------------------------------------------		# -----------------------------------------------------------------
	# Build debug ramdisk and debug boot image.		# Build debug ramdisk and debug boot image.

core/soong_config.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -194,6 +194,8 @@ $(call add_json_str, SystemExtPath, $(TARGET_COPY_OUT_SYSTE
	$(call add_json_str, SystemDlkmPath, $(TARGET_COPY_OUT_SYSTEM_DLKM))		$(call add_json_str, SystemDlkmPath, $(TARGET_COPY_OUT_SYSTEM_DLKM))
	$(call add_json_str, OemPath, $(TARGET_COPY_OUT_OEM))		$(call add_json_str, OemPath, $(TARGET_COPY_OUT_OEM))
	$(call add_json_bool, MinimizeJavaDebugInfo, $(filter true,$(PRODUCT_MINIMIZE_JAVA_DEBUG_INFO)))		$(call add_json_bool, MinimizeJavaDebugInfo, $(filter true,$(PRODUCT_MINIMIZE_JAVA_DEBUG_INFO)))
			$(call add_json_str, RecoveryPath, $(TARGET_COPY_OUT_RECOVERY))
			$(call add_json_bool, BuildingRecoveryImage, $(BUILDING_RECOVERY_IMAGE))

	$(call add_json_bool, UseGoma, $(filter-out false,$(USE_GOMA)))		$(call add_json_bool, UseGoma, $(filter-out false,$(USE_GOMA)))
	$(call add_json_bool, UseRBE, $(filter-out false,$(USE_RBE)))		$(call add_json_bool, UseRBE, $(filter-out false,$(USE_RBE)))