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

Commit 20dbd142 authored by Tiffany Yang's avatar Tiffany Yang Committed by Automerger Merge Worker
Browse files

Merge "Make common signature system property definitions optional" into main... 

Merge "Make common signature system property definitions optional" into main am: b8306086 am: e728051f am: 13ba580f

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



Change-Id: I5014024fae5b0c896aa0898d2c71faea453677e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 676db002 13ba580f

core/sysprop.mk

+7 −4
Original line number Diff line number Diff line
@@ -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);\

tools/buildinfo.sh

+6 −4
Original line number Diff line number Diff line
@@ -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