StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5014024fae5b0c896aa0898d2c71faea453677e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tiffany Yang
2023-07-12 20:23:18 +00:00
committed by Automerger Merge Worker
parent 676db002b7 13ba580f9f
commit 20dbd142b6
2 changed files with 13 additions and 8 deletions
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