commit e59293ba048a27421a4c282221341468821e2451
author Lalit Maganti <lalitm@google.com> Wed May 22 15:07:39 2019 +0100
committer Lalit Maganti <lalitm@google.com> Wed May 22 15:07:39 2019 +0100
tree 7fb047ff596c64d53e777cf34004b338465d1df4
parent 62d21cb470dca56da60a44cddd890e21cd951632

metrics: add typechecking to metric result protos

This CL adds the ability to check the types of fields returned from
SQL proto builder functions to ensure that the generated protos are
well formed. We also set the foundation for proper support for nested
repeated fields here.

Finally, add support for null messages resulting in the proto field
not being set.

Bug: 133300274
Change-Id: I0f0df97215239b05bea7ea534221042f815f95ee

Android.bp

diff --git a/Android.bp b/Android.bp
index f962ee2..e304cdf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1883,6 +1883,41 @@
   ],
 }
 
+// GN target: //protos/perfetto/trace_processor:metrics_impl_zero_gen
+genrule {
+  name: "perfetto_protos_perfetto_trace_processor_metrics_impl_zero_gen",
+  srcs: [
+    "protos/perfetto/trace_processor/metrics_impl.proto",
+  ],
+  tools: [
+    "aprotoc",
+    "perfetto_src_protozero_protoc_plugin_protoc_plugin___gn_standalone_toolchain_gcc_like_host_",
+  ],
+  cmd: "mkdir -p $(genDir)/external/perfetto/protos && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/protos --proto_path=external/perfetto/protos --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protoc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/protos $(in)",
+  out: [
+    "external/perfetto/protos/perfetto/trace_processor/metrics_impl.pbzero.cc",
+  ],
+}
+
+// GN target: //protos/perfetto/trace_processor:metrics_impl_zero_gen
+genrule {
+  name: "perfetto_protos_perfetto_trace_processor_metrics_impl_zero_gen_headers",
+  srcs: [
+    "protos/perfetto/trace_processor/metrics_impl.proto",
+  ],
+  tools: [
+    "aprotoc",
+    "perfetto_src_protozero_protoc_plugin_protoc_plugin___gn_standalone_toolchain_gcc_like_host_",
+  ],
+  cmd: "mkdir -p $(genDir)/external/perfetto/protos && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/protos --proto_path=external/perfetto/protos --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_protoc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/protos $(in)",
+  out: [
+    "external/perfetto/protos/perfetto/trace_processor/metrics_impl.pbzero.h",
+  ],
+  export_include_dirs: [
+    "protos",
+  ],
+}
+
 // GN target: //protos/perfetto/trace/profiling:lite_gen
 genrule {
   name: "perfetto_protos_perfetto_trace_profiling_lite_gen",
@@ -3170,6 +3205,7 @@
     ":perfetto_protos_perfetto_trace_minimal_lite_gen",
     ":perfetto_protos_perfetto_trace_power_lite_gen",
     ":perfetto_protos_perfetto_trace_power_zero_gen",
+    ":perfetto_protos_perfetto_trace_processor_metrics_impl_zero_gen",
     ":perfetto_protos_perfetto_trace_profiling_lite_gen",
     ":perfetto_protos_perfetto_trace_profiling_zero_gen",
     ":perfetto_protos_perfetto_trace_ps_lite_gen",
@@ -3290,6 +3326,7 @@
     "perfetto_protos_perfetto_trace_minimal_lite_gen_headers",
     "perfetto_protos_perfetto_trace_power_lite_gen_headers",
     "perfetto_protos_perfetto_trace_power_zero_gen_headers",
+    "perfetto_protos_perfetto_trace_processor_metrics_impl_zero_gen_headers",
     "perfetto_protos_perfetto_trace_profiling_lite_gen_headers",
     "perfetto_protos_perfetto_trace_profiling_zero_gen_headers",
     "perfetto_protos_perfetto_trace_ps_lite_gen_headers",