From 0bbbc93c31ad238c3868013270c459fa26588cf0 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 8 Oct 2020 22:14:44 +0000 Subject: [PATCH] Revert "Add timestamp to ramdisk." This reverts commit 7a532ab1e9cd1ce9768ee14898df01d7bc5d8c2e. Reason for revert: conflicts with device-specific sepolicy Bug: 170364317 Bug: 170411692 Change-Id: I9e7094e5f7be6f2c53ed27c658530370d794a5e2 --- core/Makefile | 10 ---------- core/main.mk | 1 - core/sysprop.mk | 10 ---------- 3 files changed, 21 deletions(-) diff --git a/core/Makefile b/core/Makefile index dd4190aec..1f9bd14d6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1829,15 +1829,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 @@ -1882,7 +1873,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 diff --git a/core/main.mk b/core/main.mk index 0e419a2d7..36071b8d2 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1739,7 +1739,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) \ diff --git a/core/sysprop.mk b/core/sysprop.mk index 26456c913..73dbec792 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -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)))