Merge "Fix DISPLAY_BUILD_NUMBER" into main am: 66884937f8

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

Change-Id: I8c988d7a683c4de87096e85fe3175fd352c40067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-19 01:39:03 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -132,7 +132,7 @@ def main():
# Dev. branches should have DISPLAY_BUILD_NUMBER set
if option.display_build_number:
print(f"ro.build.display.id?={option.build_id} {build_number} {option.build_keys}")
print(f"ro.build.display.id?={option.build_id}.{build_number} {option.build_keys}")
else:
print(f"ro.build.display.id?={option.build_id} {option.build_keys}")
else:

View File

@@ -188,7 +188,7 @@ def generate_build_info(args):
# Dev. branches should have DISPLAY_BUILD_NUMBER set
if config["DisplayBuildNumber"]:
print(f"ro.build.display.id?={config['BuildId']} {config['BuildNumber']} {config['BuildKeys']}")
print(f"ro.build.display.id?={config['BuildId']}.{config['BuildNumber']} {config['BuildKeys']}")
else:
print(f"ro.build.display.id?={config['BuildId']} {config['BuildKeys']}")
else: