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

Merge "Fix a bug that BUILD_VERSION_TAGS is ignored" into main am: 8884854267 am: 21c898d598

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

Change-Id: I2e6716044b44b1b5e912275ec6c9cb9598f55a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-06-26 03:08:48 +00:00
committed by Automerger Merge Worker
parent 4db62fe07b 21c898d598
commit 5ba605d81d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/buildinfo.py
View File

@@ -68,6 +68,7 @@ def parse_args():
option.build_id = product_config["BuildId"]
option.build_type = product_config["BuildType"]
option.build_variant = get_build_variant(product_config)
option.build_version_tags = product_config["BuildVersionTags"]
option.cpu_abis = product_config["DeviceAbi"]
option.default_locale = None
if len(product_config.get("ProductLocales", [])) > 0:
@@ -96,9 +97,11 @@ def main():
build_hostname = option.build_hostname_file.read().strip()
build_number = option.build_number_file.read().strip()
build_version_tags = option.build_keys
build_version_tags_list = option.build_version_tags
if option.build_type == "debug":
build_version_tags = "debug," + build_version_tags
build_version_tags_list.append("debug")
build_version_tags_list.append(option.build_keys)
build_version_tags = ",".join(sorted(set(build_version_tags_list)))
raw_date = option.date_file.read().strip()
date = subprocess.check_output(["date", "-d", f"@{raw_date}"], text=True).strip()

8
scripts/gen_build_prop.py
View File

@@ -73,9 +73,13 @@ def parse_args():
config["BuildHostname"] = args.build_hostname_file.read().strip()
config["BuildNumber"] = args.build_number_file.read().strip()
config["BuildUsername"] = args.build_username
config["BuildVersionTags"] = config["BuildKeys"]
build_version_tags_list = config["BuildVersionTags"]
if config["BuildType"] == "debug":
config["BuildVersionTags"] = "debug," + config["BuildVersionTags"]
build_version_tags_list.append("debug")
build_version_tags_list.append(config["BuildKeys"])
build_version_tags = ",".join(sorted(set(build_version_tags_list)))
config["BuildVersionTags"] = build_version_tags
raw_date = args.date_file.read().strip()
config["Date"] = subprocess.check_output(["date", "-d", f"@{raw_date}"], text=True).strip()