commit 1b99efdc5470b97a1900374b905c287fba6622be
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Jan 15 22:34:54 2019 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Tue Jan 15 22:34:54 2019 +0000
tree 4cbf977c1e9f1070da74208caa59deebe8c24f0a
parent 46fa8da2ba9830a35ecffef7c08a5ee57efd194b
parent 8c664c5cc7e60d7e4d9adfbe4b21514aa753b5f0

Snap for 5234541 from 8c664c5cc7e60d7e4d9adfbe4b21514aa753b5f0 to sdk-release

Change-Id: I11c1a54f4307d9fc3e08cf1c0da205c46a9f1d52

tests/common/Android.mk

diff --git a/tests/common/Android.mk b/tests/common/Android.mk
index 2e80aa2..3ab16c0 100644
--- a/tests/common/Android.mk
+++ b/tests/common/Android.mk
@@ -11,7 +11,7 @@
     android-support-test \
     guava \
     mockito-target \
-    platform-robolectric-3.6.1-prebuilt \
+    platform-robolectric-3.6.2-prebuilt \
     truth-0-36-prebuilt-jar \
     ub-uiautomator \
 

tuner/tests/testing/Android.mk

diff --git a/tuner/tests/testing/Android.mk b/tuner/tests/testing/Android.mk
index 0d71b73..c0d5dda 100644
--- a/tuner/tests/testing/Android.mk
+++ b/tuner/tests/testing/Android.mk
@@ -11,7 +11,7 @@
     android-support-test \
     guava \
     mockito-target \
-    platform-robolectric-3.6.1-prebuilt \
+    platform-robolectric-3.6.2-prebuilt \
     truth-0-36-prebuilt-jar \
     ub-uiautomator \
 

version.mk

diff --git a/version.mk b/version.mk
index 57f3a43..90fe55e 100644
--- a/version.mk
+++ b/version.mk
@@ -58,7 +58,7 @@
 #####################################################
 #####################################################
 # 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
@@ -94,12 +94,12 @@
 #       and hh is the git hash
 # 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 := $(shell date +%Y-%m-%d)
-    version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
+    version_name_package := $(base_version_major).$(base_version_minor).$(code_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).$(code_version_build) ($(BUILD_NUMBER)-$(base_version_arch)$(base_version_density))
+    version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density))
 endif
 else # !TARGET_BUILD_APPS
     version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build)