Merge changes I7953020c,I960cfdb8 into main am: 3f5f02b287 am: 6743a85379

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

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

View File

@@ -335,6 +335,7 @@ class Runner():
"--build-mode", "--build-mode",
"--all-modules", "--all-modules",
f"--dir={self._options.root}", f"--dir={self._options.root}",
"--skip-metrics-upload",
] + modules ] + modules
env = dict(os.environ) env = dict(os.environ)
env["TARGET_PRODUCT"] = lunch.target_product env["TARGET_PRODUCT"] = lunch.target_product

View File

@@ -73,14 +73,6 @@ def LoadSummary(filename):
# Rows: # Rows:
# Benchmark # Benchmark
@dataclasses.dataclass(frozen=True)
class Key():
pass
class Column():
def __init__(self):
pass
def lunch_str(d): def lunch_str(d):
"Convert a lunch dict to a string" "Convert a lunch dict to a string"
return f"{d['TARGET_PRODUCT']}-{d['TARGET_RELEASE']}-{d['TARGET_BUILD_VARIANT']}" return f"{d['TARGET_PRODUCT']}-{d['TARGET_RELEASE']}-{d['TARGET_BUILD_VARIANT']}"
@@ -186,7 +178,7 @@ def main(argv):
for key, column in summary["columns"]: for key, column in summary["columns"]:
for id, cell in column: for id, cell in column:
duration_ns = statistics.median([b["duration_ns"] for b in cell]) duration_ns = statistics.median([b["duration_ns"] for b in cell])
table.Set(tuple([summary["date"].strftime("YYYY-MM-DD"), table.Set(tuple([summary["date"].strftime("%Y-%m-%d"),
summary["branch"], summary["branch"],
summary["tag"]] summary["tag"]]
+ list(key)), + list(key)),