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

Commit 401e3a87 authored by Ameya Thakur's avatar Ameya Thakur Committed by Gerrit - the friendly Code Review server
Browse files

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

We now use the new API to determine if the update package is compatible
with the device it is currently being applied on or not. We also use the
32 bit updater libraries while compiling the ota package

Change-Id: I4d1d2bd90e03e6f4b2f786d25c6d02f62243c3f3
parent 555c3aba

core/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -1306,8 +1306,12 @@ 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,sqlite3)/sqlite3

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_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)



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

tools/releasetools/edify_generator.py

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ class EdifyGenerator(object): 


  def AssertDevice(self, device):

    """Assert that the device identifier is the given string."""

    cmd = ('getprop("ro.product.device") == "%s" || '

    cmd = ('get_device_compatible("%s") == "OK" || '

           'abort("This package is for \\"%s\\" devices; '

           'this is a \\"" + getprop("ro.product.device") + "\\".");'

           ) % (device, device)