Fix build and address nits from aosp/1172102
Fixing merge conflict and nits pending from aosp/1172102.
Bug: 132880619
TBR: hjd
Change-Id: I666bc36263f97c84bb009a8a12e0737a12530344
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",
diff --git a/include/perfetto/protozero/cpp_message_obj.h b/include/perfetto/protozero/cpp_message_obj.h
index f52574a..5af080f 100644
--- a/include/perfetto/protozero/cpp_message_obj.h
+++ b/include/perfetto/protozero/cpp_message_obj.h
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2019 The Android Open Source Project
*
diff --git a/include/perfetto/tracing/core/forward_decls.h b/include/perfetto/tracing/core/forward_decls.h
index 8d5319c..954382e 100644
--- a/include/perfetto/tracing/core/forward_decls.h
+++ b/include/perfetto/tracing/core/forward_decls.h
@@ -24,7 +24,7 @@
// property for a large and complex codebase.
// 2. Adding #include to build-time-generated headers from headers typically
// creates subtle build errors that are hard to spot in GN. This is because
-// once a standard header (say foo.h9 has an #include "protos/foo.gen.h",
+// once a standard header (say foo.h) has an #include "protos/foo.gen.h",
// the build target that depends on foo.h needs to depend on the genrule
// that generates foo.gen.h. This is achievable using public_deps in GN but
// is not testable / enforceable, hence too easy to get wrong.
diff --git a/src/protozero/virtual_destructors.cc b/src/protozero/virtual_destructors.cc
index 1e452a4..e08d0a8 100644
--- a/src/protozero/virtual_destructors.cc
+++ b/src/protozero/virtual_destructors.cc
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2019 The Android Open Source Project
*