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

Unverified Commit 7a517a0e authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

Revert "build: releasetools: ota: Add support for 32-64 bit upgrades" 

* This was only required for tomato kitkat 32bit to lollipop 64bit
  migration. This is no longer a supported upgrade case, so revert
  it to be inline with AOSP.
* Users coming from stock should flash an updated 64bit recovery first

This reverts commit b8951067.

Change-Id: Iccf37e5292c2068e9a1f8aeb370719cd9ced8c44
parent 5bcb8b7a

core/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -1841,11 +1841,8 @@ built_ota_tools := 


# We can't build static executables when SANITIZE_TARGET=address

ifeq ($(strip $(SANITIZE_TARGET)),)

ifeq ($(TARGET_ARCH),arm64)

	built_ota_tools += $(call intermediates-dir-for,EXECUTABLES,updater,,,32)/updater

else

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

endif

built_ota_tools += \

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

endif



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