diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-11 06:14:27 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-11 06:14:27 -0800 |
| commit | 58ec14b645fb658a48bd1221d301d26ba682fac0 (patch) | |
| tree | dc86951ff52c43b08cabd5682464875a63256086 /version.mk | |
| parent | dc84ad7f884aa552cc753bd5669edbb40eb912cc (diff) | |
| parent | dae652960855bdcac19cf951fb0aa4a7a01cf268 (diff) | |
| download | android_packages_apps_Snap-58ec14b645fb658a48bd1221d301d26ba682fac0.tar.gz android_packages_apps_Snap-58ec14b645fb658a48bd1221d301d26ba682fac0.tar.bz2 android_packages_apps_Snap-58ec14b645fb658a48bd1221d301d26ba682fac0.zip | |
Merge "change to BUILD_NUMBER_FROM_FILE" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'version.mk')
| -rwxr-xr-x | version.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/version.mk b/version.mk index 99fdcdd4b..6cdfb90b0 100755 --- a/version.mk +++ b/version.mk @@ -45,7 +45,7 @@ base_version_build := 025 ##################################################### ##################################################### # Collect automatic version code parameters -ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" +ifneq "" "$(filter eng.%,$(BUILD_NUMBER_FROM_FILE))" # This is an eng build base_version_buildtype := 0 else @@ -84,8 +84,8 @@ version_code_package := $(base_version_major)$(base_version_minor)$(base_version # - 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 -ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" +# On eng builds, the BUILD_NUMBER_FROM_FILE has the user and timestamp inline +ifneq "" "$(filter eng.%,$(BUILD_NUMBER_FROM_FILE))" git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h) date_string := $$(date +%m%d%y_%H%M%S) version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density)) |