Fix a bug that BUILD_VERSION_TAGS is ignored
Bug: 349046347
Test: set BUILD_VERSION_TAGS and build
Change-Id: Ib981d917435d23139ac0c5b0aba5b6893539d200
diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py
index 6c02906..42e3207 100644
--- a/scripts/gen_build_prop.py
+++ b/scripts/gen_build_prop.py
@@ -73,9 +73,13 @@
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()