commit c4117aa99e3e109cd95fa0277266564eb2347ab1
author Daniele Di Proietto <ddiproietto@google.com> Wed Jun 21 09:14:19 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 21 09:14:19 2023 +0000
tree ddf824e5749ef3b74db480e4bfe7691e2786386f
parent ba98809d9f3007fce1ab80469e532db9d83a1f2d
parent 18c60f4b8d0495c53cfdfba7f91fc35af8d9641d

Merge "Fix bazel build"

Android.bp

diff --git a/Android.bp b/Android.bp
index 5a2b93e..590b442 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4362,6 +4362,7 @@
 genrule {
     name: "perfetto_protos_perfetto_metrics_chrome_descriptor",
     srcs: [
+        "protos/perfetto/metrics/android/android_blocking_call.proto",
         "protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto",
         "protos/perfetto/metrics/android/android_frame_timeline_metric.proto",
         "protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto",
@@ -4436,6 +4437,7 @@
 genrule {
     name: "perfetto_protos_perfetto_metrics_descriptor",
     srcs: [
+        "protos/perfetto/metrics/android/android_blocking_call.proto",
         "protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto",
         "protos/perfetto/metrics/android/android_frame_timeline_metric.proto",
         "protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto",
@@ -4493,6 +4495,7 @@
 genrule {
     name: "perfetto_protos_perfetto_metrics_webview_descriptor",
     srcs: [
+        "protos/perfetto/metrics/android/android_blocking_call.proto",
         "protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto",
         "protos/perfetto/metrics/android/android_frame_timeline_metric.proto",
         "protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto",

BUILD

diff --git a/BUILD b/BUILD
index ffa722f..adfd623 100644
--- a/BUILD
+++ b/BUILD
@@ -3935,6 +3935,7 @@
 perfetto_proto_library(
     name = "protos_perfetto_metrics_android_protos",
     srcs = [
+        "protos/perfetto/metrics/android/android_blocking_call.proto",
         "protos/perfetto/metrics/android/android_blocking_calls_cuj_metric.proto",
         "protos/perfetto/metrics/android/android_frame_timeline_metric.proto",
         "protos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.proto",

protos/perfetto/metrics/android/BUILD.gn

diff --git a/protos/perfetto/metrics/android/BUILD.gn b/protos/perfetto/metrics/android/BUILD.gn
index 5a48545..90ca5af 100644
--- a/protos/perfetto/metrics/android/BUILD.gn
+++ b/protos/perfetto/metrics/android/BUILD.gn
@@ -20,9 +20,10 @@
     "source_set",
   ]
   sources = [
-    "android_sysui_notifications_blocking_calls_metric.proto",
+    "android_blocking_call.proto",
     "android_blocking_calls_cuj_metric.proto",
     "android_frame_timeline_metric.proto",
+    "android_sysui_notifications_blocking_calls_metric.proto",
     "android_trusty_workqueues.proto",
     "batt_metric.proto",
     "binder_metric.proto",