commit b39c77f620d8e9d95a102bdc2a1fb3731c51a62d
author Silvia Vinyes <silviavinyes@google.com> Tue Jun 04 10:46:12 2019 +0100
committer Silvia Vinyes <silviavinyes@google.com> Wed Jun 05 18:00:05 2019 +0100
tree 90b247908bf948804bec49a63d8be70a192e77c6
parent 8c188470dc35c1ae88cc8678a99519c6d0ffde33

Add extractor for battery counters.

Test: tools/diff_test_trace_processor.py --test-type metrics out/android/trace_processor_shell

Change-Id: I1f56c160ffc6535dc06957954e9f8e56a284ff0c

Android.bp

diff --git a/Android.bp b/Android.bp
index 8725cf5..906a27c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,7 @@
 genrule {
   name: "gen_merged_sql_metrics",
   srcs: [
+    "src/trace_processor/metrics/android/android_batt.sql",
     "src/trace_processor/metrics/android/android_mem.sql",
     "src/trace_processor/metrics/android/android_mem_lmk.sql",
     "src/trace_processor/metrics/android/android_mem_proc_counters.sql",
@@ -1239,6 +1240,7 @@
 genrule {
   name: "perfetto_protos_perfetto_metrics_android_zero_gen",
   srcs: [
+    "protos/perfetto/metrics/android/batt_metric.proto",
     "protos/perfetto/metrics/android/heap_profile.proto",
     "protos/perfetto/metrics/android/mem_metric.proto",
     "protos/perfetto/metrics/android/startup_metric.proto",
@@ -1249,6 +1251,7 @@
   ],
   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/metrics/android/batt_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/heap_profile.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/mem_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/startup_metric.pbzero.cc",
@@ -1259,6 +1262,7 @@
 genrule {
   name: "perfetto_protos_perfetto_metrics_android_zero_gen_headers",
   srcs: [
+    "protos/perfetto/metrics/android/batt_metric.proto",
     "protos/perfetto/metrics/android/heap_profile.proto",
     "protos/perfetto/metrics/android/mem_metric.proto",
     "protos/perfetto/metrics/android/startup_metric.proto",
@@ -1269,6 +1273,7 @@
   ],
   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/metrics/android/batt_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/heap_profile.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/mem_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/startup_metric.pbzero.h",