commit 3e5b915e69ba3b4795425b79492f8e6bcc49e971
author Ioannis Ilkos <ilkos@google.com> Mon Jun 17 19:09:58 2019 +0100
committer Ioannis Ilkos <ilkos@google.com> Mon Jun 17 19:09:58 2019 +0100
tree 1982263ff692365a70c8e8f6b0946d9b68d00128
parent 37bddf4e6bea1928e05a9505e81dbddee13b8366

Split out LMK metric from android_mem

Bug: b/135210430
Change-Id: I55369601fb7c6921c4f2fad167ff337c438abc07

Android.bp

diff --git a/Android.bp b/Android.bp
index 5285dc4..3dae077 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,9 +20,10 @@
     "src/trace_processor/metrics/android/android_batt.sql",
     "src/trace_processor/metrics/android/android_cpu.sql",
     "src/trace_processor/metrics/android/android_cpu_agg.sql",
+    "src/trace_processor/metrics/android/android_lmk.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",
+    "src/trace_processor/metrics/android/android_powrails.sql",
     "src/trace_processor/metrics/android/android_startup.sql",
     "src/trace_processor/metrics/android/android_startup_cpu.sql",
     "src/trace_processor/metrics/android/android_startup_launches.sql",
@@ -1282,7 +1283,9 @@
     "protos/perfetto/metrics/android/batt_metric.proto",
     "protos/perfetto/metrics/android/cpu_metric.proto",
     "protos/perfetto/metrics/android/heap_profile.proto",
+    "protos/perfetto/metrics/android/lmk_metric.proto",
     "protos/perfetto/metrics/android/mem_metric.proto",
+    "protos/perfetto/metrics/android/powrails_metric.proto",
     "protos/perfetto/metrics/android/startup_metric.proto",
   ],
   tools: [
@@ -1294,7 +1297,9 @@
     "external/perfetto/protos/perfetto/metrics/android/batt_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/cpu_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/heap_profile.pbzero.cc",
+    "external/perfetto/protos/perfetto/metrics/android/lmk_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/mem_metric.pbzero.cc",
+    "external/perfetto/protos/perfetto/metrics/android/powrails_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/startup_metric.pbzero.cc",
   ],
 }
@@ -1306,7 +1311,9 @@
     "protos/perfetto/metrics/android/batt_metric.proto",
     "protos/perfetto/metrics/android/cpu_metric.proto",
     "protos/perfetto/metrics/android/heap_profile.proto",
+    "protos/perfetto/metrics/android/lmk_metric.proto",
     "protos/perfetto/metrics/android/mem_metric.proto",
+    "protos/perfetto/metrics/android/powrails_metric.proto",
     "protos/perfetto/metrics/android/startup_metric.proto",
   ],
   tools: [
@@ -1318,7 +1325,9 @@
     "external/perfetto/protos/perfetto/metrics/android/batt_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/cpu_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/heap_profile.pbzero.h",
+    "external/perfetto/protos/perfetto/metrics/android/lmk_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/mem_metric.pbzero.h",
+    "external/perfetto/protos/perfetto/metrics/android/powrails_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/startup_metric.pbzero.h",
   ],
   export_include_dirs: [