Fix 'date' so that it does not cause regeneration for unbundled builds am: a48eac716c
am: 7154309624
Change-Id: I9a177486d2feaa409656244e7e856396227581ef
This commit is contained in:
+1
-1
@@ -108,7 +108,7 @@ version_code_package := $(base_version_major)$(base_version_minor)$(base_version
|
|||||||
ifdef TARGET_BUILD_APPS
|
ifdef TARGET_BUILD_APPS
|
||||||
ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
|
ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
|
||||||
git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h)
|
git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h)
|
||||||
date_string := $(shell date +%m%d%y_%H%M%S)
|
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))
|
version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
|
||||||
else
|
else
|
||||||
version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density))
|
version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density))
|
||||||
|
|||||||
Reference in New Issue
Block a user