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

Commit b69b7d7f authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Fix recovery image build for 32p"

parents 70d3c707 7c02ec91

core/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolic 
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_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery

recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery,,,$(TARGET_PREFER_32_BIT))/recovery

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



# Select the 18x32 font on high-density devices; and the 12x22 font on
@@ -1156,11 +1156,11 @@ define package_files-copy-root 
endef



built_ota_tools := \

	$(call intermediates-dir-for,EXECUTABLES,applypatch)/applypatch \

	$(call intermediates-dir-for,EXECUTABLES,applypatch_static)/applypatch_static \

	$(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq \

	$(call intermediates-dir-for,EXECUTABLES,sqlite3)/sqlite3 \

	$(call intermediates-dir-for,EXECUTABLES,updater)/updater

	$(call intermediates-dir-for,EXECUTABLES,applypatch,,,$(TARGET_PREFER_32_BIT))/applypatch \

	$(call intermediates-dir-for,EXECUTABLES,applypatch_static,,,$(TARGET_PREFER_32_BIT))/applypatch_static \

	$(call intermediates-dir-for,EXECUTABLES,check_prereq,,,$(TARGET_PREFER_32_BIT))/check_prereq \

	$(call intermediates-dir-for,EXECUTABLES,sqlite3,,,$(TARGET_PREFER_32_BIT))/sqlite3 \

	$(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater

$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)



$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION)