From 643201f539c851df3e93c98e5cdeb62854b697dc Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 2 Jan 2019 14:26:53 -0800 Subject: [PATCH] Replace USER with BUILD_USERNAME USER may be "nobody" if the build is sandboxed. BUILD_USERNAME will have the original value in all cases. Bug: 122270019 Test: none Change-Id: Ie632c7fa7077ba225e9ad2e770ce9a7a7889552e --- version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.mk b/version.mk index 3424b9d41..9c3997e6c 100644 --- a/version.mk +++ b/version.mk @@ -88,7 +88,7 @@ ifdef TARGET_BUILD_APPS 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 -- 2.11.0