commit 73a99f447e2395ea63e72a03b53ddf2711afaf89
author Dan Willemsen <dwillemsen@google.com> Thu Jan 10 13:36:41 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 10 13:36:41 2019 -0800
tree 42612b2128633ee300812396d8107b2fef2aa9c9
parent 98e4cfeaf29ad01230e6efaa79f63393079d404a
parent 072e9fe5bfaf3cd9f9b194bbf3c353cc1b57c02f

Merge "Replace USER with BUILD_USERNAME"
am: 072e9fe5bf

Change-Id: Ieff7c94119f828c9e1e4f0e1d8cbcbc7225ccaff

version.mk

diff --git a/version.mk b/version.mk
index 3424b9d..9c3997e 100644
--- a/version.mk
+++ b/version.mk
@@ -88,7 +88,7 @@
 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))
+  version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(BUILD_USERNAME).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
 else
   version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density))
 endif