diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-20 13:27:56 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-02-21 10:33:18 -0800 |
| commit | 083ba4dda431ee0e6b2d16f3817b45dbee755fba (patch) | |
| tree | 72b6303820c9ac94c45618092a41e8c35780f51c | |
| parent | 06581469971b7580fa19acd799f54c90d1d2b539 (diff) | |
| download | android_packages_apps_Camera2-083ba4dda431ee0e6b2d16f3817b45dbee755fba.tar.gz android_packages_apps_Camera2-083ba4dda431ee0e6b2d16f3817b45dbee755fba.tar.bz2 android_packages_apps_Camera2-083ba4dda431ee0e6b2d16f3817b45dbee755fba.zip | |
Use HAS_BUILD_NUMBER to check engineering build
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.
Test: m -j32
Bug: b/70351683
Change-Id: I95fcc5c92130182a3720f3c08469f196d7f7b4f9
| -rw-r--r-- | version.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/version.mk b/version.mk index 7b382100e..3424b9d41 100644 --- a/version.mk +++ b/version.mk @@ -43,7 +43,7 @@ base_version_build := 002 ##################################################### ##################################################### # Collect automatic version code parameters -ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" +ifeq ($(strip $(HAS_BUILD_NUMBER)),false) # This is an eng build base_version_buildtype := 0 else @@ -85,7 +85,7 @@ version_code_package := $(base_version_major)$(base_version_minor)$(base_version # 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))" +ifeq ($(strip $(HAS_BUILD_NUMBER)),false) 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)) |