1 files changed, 20 insertions, 23 deletions
diff --git a/tools/ftrace_proto_gen/BUILD.gn b/tools/ftrace_proto_gen/BUILD.gn
index a63d69606..20727bb1a 100644
--- a/tools/ftrace_proto_gen/BUILD.gn
+++ b/tools/ftrace_proto_gen/BUILD.gn
@@ -12,37 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../gn/perfetto_host_executable.gni")
-import("../../gn/test.gni")
-
-perfetto_host_executable("ftrace_proto_gen") {
-  testonly = true
-  sources = [
-    "main.cc",
-  ]
-  deps = [
-    ":lib",
-    "../../gn:default_deps",
-    "../../gn:protobuf_full",
-    "../../src/base",
-    "../../src/traced/probes/ftrace:format_parser",
-  ]
-}
-
-perfetto_unittest_source_set("unittests") {
+source_set("unittests") {
   testonly = true
   deps = [
-    ":lib",
+    ":ftrace_proto_gen_src",
     "../../gn:default_deps",
-    "../../gn:gtest_and_gmock",
-    "../../gn:protobuf_full",
+    "../../gn:gtest_deps",
+    "../../gn:protobuf_full_deps",
   ]
   sources = [
     "ftrace_proto_gen_unittest.cc",
   ]
 }
 
-source_set("lib") {
+source_set("ftrace_proto_gen_src") {
   testonly = true
   sources = [
     "ftrace_descriptor_gen.cc",
@@ -54,7 +37,21 @@ source_set("lib") {
   ]
   deps = [
     "../../gn:default_deps",
-    "../../gn:protobuf_full",
+    "../../gn:protobuf_full_deps",
+    "../../src/base",
+    "../../src/traced/probes/ftrace:format_parser",
+  ]
+}
+
+executable("ftrace_proto_gen") {
+  testonly = true
+  sources = [
+    "main.cc",
+  ]
+  deps = [
+    ":ftrace_proto_gen_src",
+    "../../gn:default_deps",
+    "../../gn:protobuf_full_deps",
     "../../src/base",
     "../../src/traced/probes/ftrace:format_parser",
   ]