Commit a211e9f6 authored by Alexei Svitkine's avatar Alexei Svitkine Committed by Commit Bot

Specify correct dependencies for gen_ukm_builders.

Also, make the hash constants use constexpr.

BUG=none

Change-Id: I7abb633d8bfac35eda50f797a2bf88b1ac8f8584
Reviewed-on: https://chromium-review.googlesource.com/811527Reviewed-by: default avatarSteven Holte <holte@chromium.org>
Commit-Queue: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523623}
parent 560f96f1
...@@ -40,6 +40,12 @@ component("metrics_cpp") { ...@@ -40,6 +40,12 @@ component("metrics_cpp") {
action("gen_ukm_builders") { action("gen_ukm_builders") {
script = "//tools/metrics/ukm/gen_builders.py" script = "//tools/metrics/ukm/gen_builders.py"
# Re-generate the outputs if the codegen code changes:
inputs = [
"//tools/metrics/ukm/builders_template.py",
"//tools/metrics/ukm/codegen.py",
"//tools/metrics/ukm/gen_builders.py",
]
sources = [ sources = [
"//tools/metrics/ukm/ukm.xml", "//tools/metrics/ukm/ukm.xml",
] ]
......
...@@ -36,14 +36,14 @@ class {event.name} : public ::ukm::internal::UkmEntryBuilderBase {{ ...@@ -36,14 +36,14 @@ class {event.name} : public ::ukm::internal::UkmEntryBuilderBase {{
~{event.name}() override; ~{event.name}() override;
static const char kEntryName[]; static const char kEntryName[];
static const uint64_t kEntryNameHash = UINT64_C({event.hash}); static constexpr uint64_t kEntryNameHash = UINT64_C({event.hash});
{metric_code} {metric_code}
}}; }};
""", """,
metric_template=""" metric_template="""
static const char k{metric.name}Name[]; static const char k{metric.name}Name[];
static const uint64_t k{metric.name}NameHash = UINT64_C({metric.hash}); static constexpr uint64_t k{metric.name}NameHash = UINT64_C({metric.hash});
{event.name}& Set{metric.name}(int64_t value); {event.name}& Set{metric.name}(int64_t value);
""") """)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment