commit 9ebefc640d00f104210991b3aa66d9c699ae9c7d
author Jiyong Park <jiyong@google.com> Tue May 26 09:59:46 2020 +0900
committer Jiyong Park <jiyong@google.com> Fri Jun 05 10:49:35 2020 +0900
tree 7e69585a34f2771366c518592b2506be65f2f8e2
parent e28fa80e12f00e3c8b646550a17d5a62aad119b5

Partial cherry-pick of ag/10260813

This change is a partial cherry-pick of ag/10260813
(Iaeefb35137de01c6ea57115d8830dd9bc30eccba) to prevent downstream merge
conflict when buildinfo_common.sh is removed by the upcoming changes.

Bug: 117892318
Test: m

Change-Id: I6194347668fd57dfb29ce1bfda16b90088483591
Merged-In: Iaeefb35137de01c6ea57115d8830dd9bc30eccba

tools/buildinfo_common.sh

diff --git a/tools/buildinfo_common.sh b/tools/buildinfo_common.sh
index 1b2e6fc..b5b6d3a 100755
--- a/tools/buildinfo_common.sh
+++ b/tools/buildinfo_common.sh
@@ -18,7 +18,8 @@
 echo "ro.${partition}.build.tags=$BUILD_VERSION_TAGS"
 echo "ro.${partition}.build.type=$TARGET_BUILD_TYPE"
 echo "ro.${partition}.build.version.incremental=$BUILD_NUMBER"
-echo "ro.${partition}.build.version.release=$PLATFORM_VERSION"
+echo "ro.${partition}.build.version.release=$PLATFORM_VERSION_LAST_STABLE"
+echo "ro.${partition}.build.version.release_or_codename=$PLATFORM_VERSION"
 echo "ro.${partition}.build.version.sdk=$PLATFORM_SDK_VERSION"
 
 echo "ro.product.${partition}.brand=$PRODUCT_BRAND"