tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make common signature system property definitions optional" into main am: b8306086d3

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: Ieb8b84d340f2308255ad2f23e5ac23635fb680de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tiffany Yang 2023-07-12 18:50:28 +00:00 committed by Automerger Merge Worker
commit e728051f12
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/sysprop.mk
View file

@ -66,9 +66,12 @@ define generate-common-build-props
)\
echo "ro.$(1).build.date=`$(DATE_FROM_FILE)`" >> $(2);\
echo "ro.$(1).build.date.utc=`$(DATE_FROM_FILE) +%s`" >> $(2);\
echo "ro.$(1).build.fingerprint=$(BUILD_FINGERPRINT_FROM_FILE)" >> $(2);\
echo "ro.$(1).build.id=$(BUILD_ID)" >> $(2);\
echo "ro.$(1).build.tags=$(BUILD_VERSION_TAGS)" >> $(2);\
# Allow optional assignments for ARC forward-declarations (b/249168657)
# TODO: Remove any tag-related inconsistencies once the goals from
# go/arc-android-sigprop-changes have been achieved.
echo "ro.$(1).build.fingerprint?=$(BUILD_FINGERPRINT_FROM_FILE)" >> $(2);\
echo "ro.$(1).build.id?=$(BUILD_ID)" >> $(2);\
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_LAST_STABLE)" >> $(2);\
@ -565,4 +568,4 @@ ALL_INSTALLED_BUILD_PROP_FILES := \
# $1 installed file path, e.g. out/target/product/vsoc_x86_64/system/build.prop
define is-build-prop
$(if $(findstring $1,$(ALL_INSTALLED_BUILD_PROP_FILES)),Y)
endef
endef

10
tools/buildinfo.sh
View file

@ -7,9 +7,9 @@ echo "# autogenerated by buildinfo.sh"
if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then
echo "ro.build.legacy.id=$BUILD_ID"
else
echo "ro.build.id=$BUILD_ID"
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.sdk=$PLATFORM_SDK_VERSION"
echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION"
@ -28,7 +28,9 @@ echo "ro.build.date.utc=`$DATE +%s`"
echo "ro.build.type=$TARGET_BUILD_TYPE"
echo "ro.build.user=$BUILD_USERNAME"
echo "ro.build.host=$BUILD_HOSTNAME"
echo "ro.build.tags=$BUILD_VERSION_TAGS"
# TODO: Remove any tag-related optional property declarations once the goals
# from go/arc-android-sigprop-changes have been achieved.
echo "ro.build.tags?=$BUILD_VERSION_TAGS"
echo "ro.build.flavor=$TARGET_BUILD_FLAVOR"
# These values are deprecated, use "ro.product.cpu.abilist"
@ -49,7 +51,7 @@ echo "# ro.build.product is obsolete; use ro.product.device"
echo "ro.build.product=$TARGET_DEVICE"
echo "# Do not try to parse description or thumbprint"
echo "ro.build.description=$PRIVATE_BUILD_DESC"
echo "ro.build.description?=$PRIVATE_BUILD_DESC"
if [ -n "$BUILD_THUMBPRINT" ] ; then
echo "ro.build.thumbprint=$BUILD_THUMBPRINT"
fi