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

Commit b7265585 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Copy adbd from system/bin to recovery/root/sbin" into oc-mr1-dev

parents e6262be0 3147e7cf

CleanSpec.mk

+4 −0
Original line number Diff line number Diff line
@@ -424,6 +424,10 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/versions_checked.mk) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/nativetest*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/nativetest*)



# Move adbd from $(PRODUCT_OUT)/root/sbin to $(PRODUCT_OUT)/system/bin

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin/adbd)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/sbin/adbd)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -1190,6 +1190,8 @@ define build-recoveryimage-target 
  @echo Copying baseline ramdisk...

  # Use rsync because "cp -Rf" fails to overwrite broken symlinks on Mac.

  $(hide) rsync -a --exclude=etc --exclude=sdcard $(IGNORE_RECOVERY_SEPOLICY) $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)

  # Copy adbd from system/bin to recovery/root/sbin

  $(hide) cp -f $(TARGET_OUT_EXECUTABLES)/adbd $(TARGET_RECOVERY_ROOT_OUT)/sbin/adbd

  @echo Modifying ramdisk contents...

  $(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)))
@@ -1244,6 +1246,8 @@ define build-recoveryimage-target 
  @echo ----- Made recovery image: $(1) --------

endef



ADBD := $(TARGET_OUT_EXECUTABLES)/adbd



ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER))

$(INSTALLED_BOOTIMAGE_TARGET) : $(BOOT_SIGNER)
@@ -1254,7 +1258,7 @@ endif 
ifeq (true,$(BOARD_AVB_ENABLE))

$(INSTALLED_BOOTIMAGE_TARGET) : $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH)

endif

$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) $(ADBD) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \

		$(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \
@@ -1269,7 +1273,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
		$(call build-recoveryimage-target, $@)

endif



$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) $(ADBD) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \