commit d0dd9068ec64ddcf8f1f6a40a52d03f7cb9e08a1
author Primiano Tucci <primiano@google.com> Mon Nov 25 22:46:53 2019 +0000
committer Primiano Tucci <primiano@google.com> Mon Nov 25 22:47:43 2019 +0000
tree 1360a1ba447ae3b59e07c371ead8e10d2611fc97
parent 004dbc282e4c9769d310aae1a65b46d97fe4fe0f

Fix build and address nits from aosp/1172102

Fixing merge conflict and nits pending from aosp/1172102.

Bug: 132880619
TBR: hjd
Change-Id: I666bc36263f97c84bb009a8a12e0737a12530344

Android.bp

diff --git a/Android.bp b/Android.bp
index dbe623c..6cf539f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6093,6 +6093,7 @@
     ":perfetto_include_perfetto_ext_tracing_ipc_ipc",
     ":perfetto_include_perfetto_protozero_protozero",
     ":perfetto_include_perfetto_tracing_core_core",
+    ":perfetto_include_perfetto_tracing_core_forward_decls",
     ":perfetto_include_perfetto_tracing_tracing",
     ":perfetto_protos_perfetto_common_cpp_gen",
     ":perfetto_protos_perfetto_common_lite_gen",