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

Commit 145e62cf authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

Merge "Create empty /linkerconfig/ld.config.txt in ramdisk." into main am: 81f8ba86 

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



Change-Id: I0416e53990a789f1a09a5f842d340b87f6c56399
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e8c4e77 81f8ba86

core/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -2727,6 +2727,8 @@ $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP): $(MKBOOTFS) $(COMPRESSION_COMMAND_ 
	$(if $(strip $(recovery_wipe)), \

	$(if $(strip $(recovery_wipe)), \

	  cp -f $(recovery_wipe) $(TARGET_RECOVERY_ROOT_OUT)/system/etc/recovery.wipe)

	  cp -f $(recovery_wipe) $(TARGET_RECOVERY_ROOT_OUT)/system/etc/recovery.wipe)

	ln -sf prop.default $(TARGET_RECOVERY_ROOT_OUT)/default.prop

	ln -sf prop.default $(TARGET_RECOVERY_ROOT_OUT)/default.prop

	# Silence warnings in first_stage_console.

	touch $(TARGET_RECOVERY_ROOT_OUT)/linkerconfig/ld.config.txt

	$(BOARD_RECOVERY_IMAGE_PREPARE)

	$(BOARD_RECOVERY_IMAGE_PREPARE)

	$(hide) touch $@

	$(hide) touch $@