X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=version.mk;h=7b382100e73c3d0303dfdfbc726666ee52ea1afe;hb=867c2a333ba82850951355504f92b98289c730f7;hp=b9926f8b143be64e69d6501b4953dc51d702a198;hpb=5186a9ff591bd5814408053e798bf79661c93266;p=android-x86%2Fpackages-apps-Camera2.git diff --git a/version.mk b/version.mk index b9926f8b1..7b382100e 100644 --- a/version.mk +++ b/version.mk @@ -79,10 +79,12 @@ endif version_code_package := $(base_version_major)$(base_version_minor)$(base_version_build)$(base_version_buildtype)$(base_version_arch)$(base_version_density) # The version name scheme for the package apk is: +# - For platform builds: M.m.bbb # - For eng build (t=0): M.m.bbb eng.$(USER)-hh # - For build server (t=1): M.m.bbb (nnnnnn-hh) # where nnnnnn is the build number from the build server (no zero-padding) # On eng builds, the BUILD_NUMBER has the user and timestamp inline +ifdef TARGET_BUILD_APPS ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h) date_string := $$(date +%m%d%y_%H%M%S) @@ -90,6 +92,9 @@ ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" else version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density)) endif +else # !TARGET_BUILD_APPS + version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) +endif # Cleanup the locals base_version_major :=