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

Commit 7c02ec91 authored by Bruce Beare's avatar Bruce Beare Committed by Yong Yao
Browse files

Fix recovery image build for 32p 



When building for 32p, we need to be explicit that we wish to build the 32bit
version of the binaries that will be placed in the recovery image. The recovery
image doesn't actually care... but if we are not explicit in this, the makefiles
will ask for the 64bit binaries but the Android.mk for the binaries will supply
the 32bit images (causing the build to fail)..

Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7
Signed-off-by: default avatarBruce Beare <bruce.j.beare@intel.com>
parent 979d578e

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
@@ -1162,11 +1162,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)