commit 040f958271382eb436a10e4de8fb9dc805cc6941
author Hector Dearman <hjd@google.com> Tue Dec 03 18:06:33 2019 +0000
committer Hector Dearman <hjd@google.com> Tue Dec 03 18:06:33 2019 +0000
tree bd1570e9b61a6216ab3638efe7bd1c286787585c
parent b6178bd6392e93cec781307f20f7816be83737a8

perfetto-cmd: Save/Load state using protozero

Change-Id: I4d686fdb8b0a3290c6126afb751bc639ea537283

Android.bp

diff --git a/Android.bp b/Android.bp
index a41c143..5a1b59e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -628,7 +628,6 @@
   ],
   shared_libs: [
     "liblog",
-    "libprotobuf-cpp-lite",
     "libz",
   ],
   generated_headers: [
@@ -4220,10 +4219,11 @@
   ],
   tools: [
     "aprotoc",
+    "perfetto_src_protozero_protoc_plugin_cppgen_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --cpp_out=$(genDir)/external/perfetto/ $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_cppgen_plugin) --plugin_out=wrapper_namespace=gen:$(genDir)/external/perfetto/ $(in)",
   out: [
-    "external/perfetto/src/perfetto_cmd/perfetto_cmd_state.pb.cc",
+    "external/perfetto/src/perfetto_cmd/perfetto_cmd_state.gen.cc",
   ],
 }
 
@@ -4235,10 +4235,11 @@
   ],
   tools: [
     "aprotoc",
+    "perfetto_src_protozero_protoc_plugin_cppgen_plugin",
   ],
-  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --cpp_out=$(genDir)/external/perfetto/ $(in)",
+  cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_cppgen_plugin) --plugin_out=wrapper_namespace=gen:$(genDir)/external/perfetto/ $(in)",
   out: [
-    "external/perfetto/src/perfetto_cmd/perfetto_cmd_state.pb.h",
+    "external/perfetto/src/perfetto_cmd/perfetto_cmd_state.gen.h",
   ],
   export_include_dirs: [
     ".",
@@ -6140,7 +6141,6 @@
   ],
   shared_libs: [
     "liblog",
-    "libprotobuf-cpp-lite",
   ],
   generated_headers: [
     "perfetto_protos_perfetto_common_cpp_gen_headers",