openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1 am: 5678ae7b1c 

Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I7a751270df9a6c02763c228f495c40c046c0115b
This commit is contained in:
Tianjie Xu 2021-05-09 00:10:02 +00:00 committed by Automerger Merge Worker
parent d6b0c24605 5678ae7b1c
commit 216c762826
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/sysprop.mk
View File

@ -260,6 +260,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B
BUILD_HOSTNAME="$(BUILD_HOSTNAME)" \ BUILD_HOSTNAME="$(BUILD_HOSTNAME)" \
BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \ BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \
BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \ BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \
BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT="$(BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT)" \
PLATFORM_VERSION="$(PLATFORM_VERSION)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \
PLATFORM_VERSION_LAST_STABLE="$(PLATFORM_VERSION_LAST_STABLE)" \ PLATFORM_VERSION_LAST_STABLE="$(PLATFORM_VERSION_LAST_STABLE)" \
PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \ PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \

7
tools/buildinfo.sh
View File

@ -3,7 +3,12 @@
echo "# begin build properties" echo "# begin build properties"
echo "# autogenerated by buildinfo.sh" echo "# autogenerated by buildinfo.sh"
echo "ro.build.id=$BUILD_ID" # The ro.build.id will be set dynamically by init, by appending the unique vbmeta digest.
if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then
echo "ro.build.legacy.id=$BUILD_ID"
else
echo "ro.build.id=$BUILD_ID"
fi
echo "ro.build.display.id=$BUILD_DISPLAY_ID" echo "ro.build.display.id=$BUILD_DISPLAY_ID"
echo "ro.build.version.incremental=$BUILD_NUMBER" echo "ro.build.version.incremental=$BUILD_NUMBER"
echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"