Bug 776185: use the buildid based on MOZ_BUILD_DATE for ANDROID_VERSION_CODE r=mfinkle

This commit is contained in:
Chris AtLee 2012-08-09 17:57:41 -04:00
parent 5b04e2e743
commit b31db82fc3

View File

@ -204,14 +204,14 @@ endif
ifeq (,$(ANDROID_VERSION_CODE)) ifeq (,$(ANDROID_VERSION_CODE))
ifeq ($(MIN_CPU_VERSION),7) ifeq ($(MIN_CPU_VERSION),7)
ANDROID_VERSION_CODE=$(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-10) ANDROID_VERSION_CODE=$(shell cat $(DEPTH)/config/buildid | cut -c1-10)
else else
# decrement the version code by 1 for armv6 builds so armv7 builds will win any compatability ties # 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) ANDROID_VERSION_CODE=$(shell echo $$((`cat $(DEPTH)/config/buildid | cut -c1-10` - 1)))
endif endif
endif endif
UA_BUILDID=$(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-8) UA_BUILDID=$(shell echo $(ANDROID_VERSION_CODE) | cut -c1-8)
# Mangle our package name to avoid Bug 750548. # Mangle our package name to avoid Bug 750548.
DEFINES += \ DEFINES += \