diff options
| author | Tom Cherry <tomcherry@google.com> | 2018-11-06 14:23:44 -0800 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2018-11-28 08:53:38 -0800 |
| commit | 3871f0fc612187e00cbd27ee16d7af8a164017fc (patch) | |
| tree | 38c47a6d02aa822d2262bd3176a4ba705733bb6f | |
| parent | 638ca85aec32fa3d4a41589f5397a4b2be0a0c84 (diff) | |
| download | build-3871f0fc612187e00cbd27ee16d7af8a164017fc.tar.gz | |
Remove copying of TARGET_OUT_RAMDISK to recovery image
This was only needed for pushing first stage init to the recovery
image. This isn't actually needed however, as the recovery image can
be fully shared and can run full init as long as there is a symlink
from /init to /system/bin/init, so that is added instead.
Bug: 80395578
Test: boot to recovery via this symlink
Change-Id: I8910543525a841401b209bfd98af30c5a0dc2688
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index 931085d40b..6ba2be9214 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1671,9 +1671,9 @@ define build-recoveryimage-target # Copying baseline ramdisk... # Use rsync because "cp -Rf" fails to overwrite broken symlinks on Mac. $(hide) rsync -a --exclude=sdcard $(IGNORE_RECOVERY_SEPOLICY) $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) - $(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),, \ - $(hide) rsync -a $(TARGET_RAMDISK_OUT)/* $(TARGET_RECOVERY_ROOT_OUT)/) # Modifying ramdisk contents... + $(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),, \ + $(hide) ln -sf /system/bin/init $(TARGET_RECOVERY_ROOT_OUT)/init) $(if $(BOARD_RECOVERY_KERNEL_MODULES), \ $(call build-image-kernel-modules,$(BOARD_RECOVERY_KERNEL_MODULES),$(TARGET_RECOVERY_ROOT_OUT),,$(call intermediates-dir-for,PACKAGING,depmod_recovery))) # Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc. @@ -3405,12 +3405,12 @@ endif # INSTALLED_RECOVERYIMAGE_TARGET defined or BOARD_USES_RECOVERY_AS_BOOT is $(hide) mkdir -p $(zip_root)/ROOT $(hide) $(call package_files-copy-root, \ $(TARGET_ROOT_OUT),$(zip_root)/ROOT) + @# If we are using recovery as boot, this is already done when processing recovery. +ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true) ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) $(hide) $(call package_files-copy-root, \ $(TARGET_RAMDISK_OUT),$(zip_root)/BOOT/RAMDISK) endif - @# If we are using recovery as boot, this is already done when processing recovery. -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true) ifdef INSTALLED_KERNEL_TARGET $(hide) cp $(INSTALLED_KERNEL_TARGET) $(zip_root)/BOOT/kernel endif |