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:
commit
216c762826
|
@ -260,6 +260,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B
|
|||
BUILD_HOSTNAME="$(BUILD_HOSTNAME)" \
|
||||
BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \
|
||||
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_LAST_STABLE="$(PLATFORM_VERSION_LAST_STABLE)" \
|
||||
PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \
|
||||
|
|
|
@ -3,7 +3,12 @@
|
|||
echo "# begin build properties"
|
||||
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.version.incremental=$BUILD_NUMBER"
|
||||
echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
|
||||
|
|
Loading…
Reference in New Issue