Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 216c7628 authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Don't set the build id if we need to append the digest" am: a530481d... 

Merge "Don't set the build id if we need to append the digest" am: a530481d am: 834dc90b am: 5678ae7b

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

Change-Id: I7a751270df9a6c02763c228f495c40c046c0115b
parents d6b0c246 5678ae7b

core/sysprop.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)" \

tools/buildinfo.sh

+6 −1
Original line number Diff line number Diff line
@@ -3,7 +3,12 @@ 
echo "# begin build properties"

echo "# autogenerated by buildinfo.sh"



# 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"