perfetto: Generate merged trace proto from white listed events
Change-Id: I0affeb6cfeb8df076303fdf2785f3d1af499ea37
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 222d364..ad839c4 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -80,16 +80,16 @@
def CheckMergedTraceConfigProto(input_api, output_api):
- tool = 'tools/gen_merged_trace_config'
+ tool = 'tools/gen_merged_protos'
build_file_filter = lambda x: input_api.FilterSourceFile(
x,
- white_list=('protos/perfetto/config/.*[.]proto$', tool))
+ white_list=('protos/perfetto/.*[.]proto$', tool))
if not input_api.AffectedSourceFiles(build_file_filter):
return []
if subprocess.call([tool, '--check-only']):
return [
output_api.PresubmitError(
- 'perfetto_config.proto is out of date. Please run ' +
- tool + ' to update it.')
+ 'perfetto_config.proto or perfetto_trace.proto is out of ' +
+ 'date. Please run ' + tool + ' to update it.')
]
return []