bug 776185 - ANDROID_VERSION_CODE needs to be based off MOZ_BUILD_DATE r=blassey

--HG--
extra : rebase_source : d815a40cb13178ef0184b5a02529a3d4d54aed79

mobile/android/base/Makefile.in

@@ -193,7 +193,12 @@ MIN_CPU_VERSION=5
 endif
 
 ifeq (,$(ANDROID_VERSION_CODE))
+ifeq ($(MIN_CPU_VERSION),7)
 ANDROID_VERSION_CODE=$(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-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 `$(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-10` - 1 | bc)
+endif
 endif
 
 UA_BUILDID=$(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-8)