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

Commit b8876e11 authored by Andres Morales's avatar Andres Morales
Browse files

[versionitis] pull image id from recovery into props 

- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
parent f55c5a52

core/Makefile

+29 −24
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ ADDITIONAL_DEFAULT_PROPERTIES += \ 
ADDITIONAL_DEFAULT_PROPERTIES := $(call uniq-pairs-by-first-component, \

    $(ADDITIONAL_DEFAULT_PROPERTIES),=)



$(INSTALLED_DEFAULT_PROP_TARGET):

intermediate_system_build_prop := $(call intermediates-dir-for,ETC,system_build_prop)/build.prop



$(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop)

	@echo Target buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo "#" > $@; \
@@ -75,7 +77,13 @@ $(INSTALLED_DEFAULT_PROP_TARGET): 
	        echo "#" >> $@;

	$(hide) $(foreach line,$(ADDITIONAL_DEFAULT_PROPERTIES), \

		echo "$(line)" >> $@;)

	build/tools/post_process_props.py $@

	$(hide) echo "#" >> $@; \

	        echo "# BOOTIMAGE_BUILD_PROPERTIES" >> $@; \

	        echo "#" >> $@;

	$(hide) echo ro.bootimage.build.date=`date`>>$@

	$(hide) echo ro.bootimage.build.date.utc=`date +%s`>>$@

	$(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT)">>$@

	$(hide) build/tools/post_process_props.py $@



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

# build.prop
@@ -107,7 +115,7 @@ BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) 


# A human-readable string that descibes this build in detail.

build_desc := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER) $(BUILD_VERSION_TAGS)

$(INSTALLED_BUILD_PROP_TARGET): PRIVATE_BUILD_DESC := $(build_desc)

$(intermediate_system_build_prop): PRIVATE_BUILD_DESC := $(build_desc)



# The string used to uniquely identify the combined build and product; used by the OTA server.

ifeq (,$(strip $(BUILD_FINGERPRINT)))
@@ -171,7 +179,7 @@ system_prop_file := $(TARGET_SYSTEM_PROP) 
else

system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)

endif

$(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file) $(INSTALLED_ANDROID_INFO_TXT_TARGET)

$(intermediate_system_build_prop): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file) $(INSTALLED_ANDROID_INFO_TXT_TARGET)

	@echo Target buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo > $@
@@ -231,6 +239,19 @@ endif 


build_desc :=



ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))

INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img

else

INSTALLED_RECOVERYIMAGE_TARGET :=

endif



$(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET)

	@echo "Target build info: $@"

	$(hide) cat $(intermediate_system_build_prop) > $@

ifdef INSTALLED_RECOVERYIMAGE_TARGET

	$(hide) echo ro.expect.recovery_id=`cat $(RECOVERYIMAGE_ID_FILE)` >> $@

endif



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

# vendor build.prop

#
@@ -248,19 +269,6 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(INSTALLED_BUILD_PROP_TARGET) 
endif



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

# boot.img build.prop

# as with vendor build.prop above, for verifying that the bootimage

# build is what we think it is



INSTALLED_BOOTIMAGE_BUILD_PROP_TARGET := $(TARGET_ROOT_OUT)/build.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_BOOTIMAGE_BUILD_PROP_TARGET)

$(INSTALLED_BOOTIMAGE_BUILD_PROP_TARGET): $(INSTALLED_BUILD_PROP_TARGET)

	@echo Target bootimage buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo > $@

	$(hide) echo ro.bootimage.build.date=`date`>>$@

	$(hide) echo ro.bootimage.build.date.utc=`date +%s`>>$@

	$(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT)">>$@



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

# sdk-build.prop
@@ -750,10 +758,7 @@ endef 
# -----------------------------------------------------------------

# Recovery image



# If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true

ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))



INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img

ifdef INSTALLED_RECOVERYIMAGE_TARGET



INTERNAL_RECOVERYIMAGE_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \

    $(ALL_DEFAULT_INSTALLED_MODULES))
@@ -762,7 +767,7 @@ recovery_initrc := $(call include-path-for, recovery)/etc/init.rc 
recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolicy.recovery

recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system

recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img

recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)

recovery_build_prop := $(intermediate_system_build_prop)

recovery_resources_common := $(call include-path-for, recovery)/res



# Set recovery_density to the density bucket of the device.
@@ -846,6 +851,7 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 
	@mkdir -p $(dir $@)

	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@



RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id

# $(1): output file

define build-recoveryimage-target

  @echo ----- Making recovery image ------
@@ -873,7 +879,7 @@ define build-recoveryimage-target 
  $(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)

  $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1).unsigned, \

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1))

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1) --id > $(RECOVERYIMAGE_ID_FILE))

  $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\

    $(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1))

  $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \
@@ -903,7 +909,6 @@ recoveryimage-nodeps: 
	$(call build-recoveryimage-target, $(INSTALLED_RECOVERYIMAGE_TARGET))



else

INSTALLED_RECOVERYIMAGE_TARGET :=

RECOVERY_RESOURCE_ZIP :=

endif