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

Commit 88848542 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix a bug that BUILD_VERSION_TAGS is ignored" into main

parents e8d5c8a5 5a994c7e

scripts/buildinfo.py

+5 −2
Original line number Diff line number Diff line
@@ -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()

scripts/gen_build_prop.py

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