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

Commit 93ca8d37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't copy system/sbin/adbd to recovery"

parents e2d0b0cc ce3e34f6

core/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -1350,8 +1350,6 @@ define build-recoveryimage-target 
  # 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

  # 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)))
@@ -1404,8 +1402,6 @@ define build-recoveryimage-target 
      $(hide) $(AVBTOOL) add_hash_footer --image $(1) --partition_size $(BOARD_RECOVERYIMAGE_PARTITION_SIZE) --partition_name recovery $(INTERNAL_AVB_RECOVERY_SIGNING_ARGS) $(BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS)))

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)
@@ -1416,7 +1412,7 @@ endif 
ifeq (true,$(BOARD_AVB_ENABLE))

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

endif

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

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

		$(INSTALLED_RAMDISK_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \

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

endif



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

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

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \

target/product/embedded.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
PRODUCT_PACKAGES += \

    adb \

    adbd \

    adbd.recovery \

    usbd \

    android.hardware.configstore@1.0-service \

    android.hidl.allocator@1.0-service \