diff options
| author | padarshr <padarshr@codeaurora.org> | 2015-09-11 12:33:10 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:20:39 -0600 |
| commit | e8baf4a8e8d8a8de4ae276a9f29956008c13f7ba (patch) | |
| tree | 1ba855eb0ae1f897cf29fc465fa2fb8c781f83fc /updater/Android.mk | |
| parent | b9083e63af1fc4519df459de5796ced0990cdf85 (diff) | |
| download | bootable_recovery-e8baf4a8e8d8a8de4ae276a9f29956008c13f7ba.zip bootable_recovery-e8baf4a8e8d8a8de4ae276a9f29956008c13f7ba.tar.gz bootable_recovery-e8baf4a8e8d8a8de4ae276a9f29956008c13f7ba.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: Iebe6107e55719141fbcc496efa0c60ef1f9368c8
Diffstat (limited to 'updater/Android.mk')
| -rw-r--r-- | updater/Android.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/updater/Android.mk b/updater/Android.mk index ff02a33..f4ed954 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -57,7 +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. @@ -79,13 +83,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 |