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

Commit 80aef6da authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.18' into caf/cm-12.0.

parents b1eb099a 17426aac

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)