bug 878868 - Need to bump build id of x86 builds for the play store r=mfinkle
authorBrad Lassey <blassey@mozilla.com>
Mon, 03 Jun 2013 13:22:18 -0400
changeset 133829 720f1ff081fb459ff2a6eb1ab84697929239236b
parent 133828 7e1ed1bb112a83b4ecf63f3b28c18c5662c108e1
child 133830 0692ed4ff443fb0d8983f8b106e0357fac8525d4
push id28916
push userblassey@mozilla.com
push dateMon, 03 Jun 2013 18:01:27 +0000
treeherdermozilla-inbound@720f1ff081fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs878868
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 878868 - Need to bump build id of x86 builds for the play store r=mfinkle
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -298,22 +298,27 @@ ifneq (,$(findstring -march=armv7,$(OS_C
 MIN_CPU_VERSION=7
 else
 MIN_CPU_VERSION=5
 endif
 
 MOZ_APP_BUILDID=$(shell cat $(DEPTH)/config/buildid)
 
 ifeq (,$(ANDROID_VERSION_CODE))
+ifeq ($(CPU_ARCH),arm)
 ifeq ($(MIN_CPU_VERSION),7)
 ANDROID_VERSION_CODE=$(shell cat $(DEPTH)/config/buildid | cut -c1-10)
 else
 # decrement the version code by 1 for armv6 builds so armv7 builds will win any compatability ties
 ANDROID_VERSION_CODE=$(shell echo $$((`cat $(DEPTH)/config/buildid | cut -c1-10` - 1)))
 endif
+else #not arm, so x86
+# increment the version code by 1 for x86 builds so they are offered to x86 phones that have arm emulators
+ANDROID_VERSION_CODE=$(shell echo $$((`cat $(DEPTH)/config/buildid | cut -c1-10` + 1)))
+endif
 endif
 
 UA_BUILDID=$(shell echo $(ANDROID_VERSION_CODE) | cut -c1-8)
 
 MOZ_BUILD_TIMESTAMP=$(shell echo `$(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-timestamp`)
 
 ifdef MOZ_UPDATER
 DEFINES +=  -DMOZ_UPDATER=$(MOZ_UPDATER)