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

Commit fa134960 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "Revert "Add timestamp to ramdisk.""

parents 396b0a20 0bbbc93c

core/Makefile

+0 −10
Original line number Diff line number Diff line
@@ -1851,15 +1851,6 @@ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \ 
	$(hide) cat $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET) >> $@

	$(call append-recovery-ui-properties,$(PRIVATE_RECOVERY_UI_PROPERTIES),$@)



# Only install boot/etc/build.prop to recovery image on recovery_as_boot.

# On device with dedicated recovery partition, the file should come from the boot

# ramdisk.

ifeq (true,$(BOARD_USES_RECOVERY_AS_BOOT))

INSTALLED_RECOVERY_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RECOVERY_ROOT_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)

$(INSTALLED_RECOVERY_RAMDISK_BUILD_PROP_TARGET): $(INSTALLED_RAMDISK_BUILD_PROP_TARGET)

	$(copy-file-to-target)

endif



ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

  INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)

ifdef GENERIC_KERNEL_CMDLINE
@@ -1904,7 +1895,6 @@ $(recovery_ramdisk): $(MKBOOTFS) $(COMPRESSION_COMMAND_DEPS) \ 
	    $(recovery_sepolicy) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \

	    $(INSTALLED_RECOVERY_RAMDISK_BUILD_PROP_TARGET) \

	    $(recovery_resource_deps) \

	    $(recovery_fstab)

	# Making recovery image

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,6 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
    $(INSTALLED_PRODUCT_BUILD_PROP_TARGET):build.prop-product \

    $(INSTALLED_ODM_BUILD_PROP_TARGET):build.prop-odm \

    $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET):build.prop-system_ext \

    $(INSTALLED_RAMDISK_BUILD_PROP_TARGET):build.prop-ramdisk \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

    $(INSTALLED_MISC_INFO_TARGET) \

core/sysprop.mk

+0 −10
Original line number Diff line number Diff line
@@ -429,13 +429,3 @@ $(eval $(call build-properties,\ 
    $(_prop_files_),\

    $(_prop_vars_),\

    $(empty)))
 


# ----------------------------------------------------------------

# ramdisk/boot/etc/build.prop

#



RAMDISK_BUILD_PROP_REL_PATH := boot/etc/build.prop

INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RAMDISK_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)

$(eval $(call build-properties,\

    bootimage,\

    $(INSTALLED_RAMDISK_BUILD_PROP_TARGET)))