commit 4df8556158697be296f1aa3ec5c0b36fa2bc3530
author Tianjie Xu <xunchang@google.com> Fri Oct 16 23:10:37 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 16 23:10:37 2020 +0000
tree 7ad4415191e4f2dbdb7c3f920c889288652b31a5
parent 5fefac293d3d83e1f9a6e47a59b4655370ff19a8
parent e88ac677c5e278b9e4caf5b67a32a591cf0e79de

Merge "Make the ro.build.version.release consistent between device build prop & partition build prop"

core/sysprop.mk

diff --git a/core/sysprop.mk b/core/sysprop.mk
index a74ff9f..fdefced 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -54,7 +54,8 @@
     echo "ro.$(1).build.tags=$(BUILD_VERSION_TAGS)" >> $(2);\
     echo "ro.$(1).build.type=$(TARGET_BUILD_VARIANT)" >> $(2);\
     echo "ro.$(1).build.version.incremental=$(BUILD_NUMBER_FROM_FILE)" >> $(2);\
-    echo "ro.$(1).build.version.release=$(PLATFORM_VERSION)" >> $(2);\
+    echo "ro.$(1).build.version.release=$(PLATFORM_VERSION_LAST_STABLE)" >> $(2);\
+    echo "ro.$(1).build.version.release_or_codename=$(PLATFORM_VERSION)" >> $(2);\
     echo "ro.$(1).build.version.sdk=$(PLATFORM_SDK_VERSION)" >> $(2);\
 
 endef