diff options
| author | Ameya Thakur <ameyat@codeaurora.org> | 2014-11-18 15:13:33 -0800 |
|---|---|---|
| committer | Rashed Abdel-Tawab <rashed@linux.com> | 2015-10-11 19:21:05 +0000 |
| commit | 4e77523999a944331f73fa723115fa56ca38334c (patch) | |
| tree | c4542c1dd2e027220dfa08001f31c36c99663bd2 /updater | |
| parent | f5cfdcecf577a435aa76592398dc80fc415fa9d6 (diff) | |
| download | bootable_recovery-4e77523999a944331f73fa723115fa56ca38334c.zip bootable_recovery-4e77523999a944331f73fa723115fa56ca38334c.tar.gz bootable_recovery-4e77523999a944331f73fa723115fa56ca38334c.tar.bz2 | |
recovery:updater: Changes to support 32->64 bit upgrades
We now support upgrading from 32 to 64 bit builds. The check for device to
package compatibility now takes into account if the product name on the
device vs the product name on the upgrade build differs only by the _32
or _64 trailing chars. In addition we also force compile the updater binary
as 32 bit executable so that it can run on the 32 bit build we are upgrading
from.
Change-Id: I51bdf948650b9c3b61cfac7142422b7325270940
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/Android.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/updater/Android.mk b/updater/Android.mk index ff02a33..1bdf977 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -57,8 +57,11 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. # any subsidiary static libraries required for your registered # extension libs. +ifeq ($(TARGET_ARCH),arm64) +inc := $(call intermediates-dir-for,PACKAGING,updater_extensions,,,32)/register.inc +else inc := $(call intermediates-dir-for,PACKAGING,updater_extensions)/register.inc - +endif # Encode the value of TARGET_RECOVERY_UPDATER_LIBS into the filename of the dependency. # So if TARGET_RECOVERY_UPDATER_LIBS is changed, a new dependency file will be generated. # Note that we have to remove any existing depency files before creating new one, @@ -79,13 +82,18 @@ $(inc) : $(inc_dep_file) $(hide) $(foreach lib,$(libs),echo " Register_$(lib)();" >> $@;) $(hide) echo "}" >> $@ -$(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater.o : $(inc) +ifeq ($(TARGET_ARCH),arm64) +$(call intermediates-dir-for,EXECUTABLES,updater,,,32)/updater.o : $(inc) +else +$(call intermediates-dir-for,EXECUTABLES,updater)/updater.o : $(inc) +endif LOCAL_C_INCLUDES += $(dir $(inc)) inc := inc_dep_file := LOCAL_MODULE := updater +LOCAL_32_BIT_ONLY := true LOCAL_FORCE_STATIC_EXECUTABLE := true |