summaryrefslogtreecommitdiffstats
path: root/core/Makefile
diff options
context:
space:
mode:
authorAmeya Thakur <ameyat@codeaurora.org>2014-11-18 15:27:07 -0800
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:29:16 -0600
commit818ea55540fa9389b6f00fd2b17e0792d032c81c (patch)
treefdda1f1160efc4a3bc703b8fd43a3290796bbb0c /core/Makefile
parentaaef34f8705c79e83d9b822f08210d56ab093e36 (diff)
downloadbuild-818ea55540fa9389b6f00fd2b17e0792d032c81c.zip
build-818ea55540fa9389b6f00fd2b17e0792d032c81c.tar.gz
build-818ea55540fa9389b6f00fd2b17e0792d032c81c.tar.bz2
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: I65ce3527087853463e28ad3b067c02c9b3d3f9c9
Diffstat (limited to 'core/Makefile')
-rw-r--r--core/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index b5ecdb7..1ad466d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1447,7 +1447,13 @@ built_ota_tools := \
$(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
+
+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)