commit 0c6bd9350040776666341a5f2e7d1886df800735
author Dan Willemsen <dwillemsen@google.com> Thu Jan 10 13:48:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 10 13:48:09 2019 -0800
tree 58b0ea5dd6ea289298cf6def0544c8c5cf875d04
parent 321c60b479b16d9065c7205d14503b42da2e56d0
parent 73a99f447e2395ea63e72a03b53ddf2711afaf89

Merge "Replace USER with BUILD_USERNAME" am: 072e9fe5bf
am: 73a99f447e

Change-Id: I99757e8935f2091e2c1d3575d27bafa0b7961e58

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