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

Commit 3b0f52be authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Conditionally generate META/boot_filesystem_config.txt." 

am: 1ac4e3c4

Change-Id: Iacc05627c74029fff8fe7c2cea02fcbe80bd1d0f
parents 17f31a11 1ac4e3c4

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -2775,9 +2775,15 @@ ifdef BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE 
	$(hide) $(call fs_config,$(zip_root)/PRODUCT,product/) > $(zip_root)/META/product_filesystem_config.txt

endif

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

	@# When using BOARD_BUILD_SYSTEM_ROOT_IMAGE, ROOT always contains the files for the root under

	@# normal boot. BOOT/RAMDISK exists only if additionally using BOARD_USES_RECOVERY_AS_BOOT.

	$(hide) $(call fs_config,$(zip_root)/ROOT,) > $(zip_root)/META/root_filesystem_config.txt

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

	$(hide) $(call fs_config,$(zip_root)/BOOT/RAMDISK,) > $(zip_root)/META/boot_filesystem_config.txt

endif

else # BOARD_BUILD_SYSTEM_ROOT_IMAGE != true

	$(hide) $(call fs_config,$(zip_root)/BOOT/RAMDISK,) > $(zip_root)/META/boot_filesystem_config.txt

endif

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

	$(hide) $(call fs_config,$(zip_root)/RECOVERY/RAMDISK,) > $(zip_root)/META/recovery_filesystem_config.txt

endif