diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn
index 882a16e306..76f99faa87 100644
--- a/webrtc/tools/BUILD.gn
+++ b/webrtc/tools/BUILD.gn
@@ -16,12 +16,50 @@ source_set("tools") {
 
 source_set("command_line_parser") {
   sources = [
-    "simple_command_line_parser.h",
     "simple_command_line_parser.cc",
+    "simple_command_line_parser.h",
+  ]
+  deps = [
+    "..:gtest_prod",
   ]
 
   configs += [ "..:common_config" ]
-  public_configs = [ "..:common_inherited_config"]
+  public_configs = [ "..:common_inherited_config" ]
+}
+
+source_set("video_quality_analysis") {
+  sources = [
+    "frame_analyzer/video_quality_analysis.cc",
+    "frame_analyzer/video_quality_analysis.h",
+  ]
+  deps = [
+    "../common_video",
+  ]
+  public_deps = [
+    "../common_video",
+  ]
+}
+
+executable("frame_analyzer") {
+  sources = [
+    "frame_analyzer/frame_analyzer.cc",
+  ]
+  deps = [
+    ":command_line_parser",
+    ":video_quality_analysis",
+  ]
+}
+
+executable("rgba_to_i420_converter") {
+  sources = [
+    "converter/converter.cc",
+    "converter/converter.h",
+    "converter/rgba_to_i420_converter.cc",
+  ]
+  deps = [
+    ":command_line_parser",
+    "../common_video",
+  ]
 }
 
 # TODO(kjellander): Convert all of tools.gyp into GN here.
@@ -35,7 +73,7 @@ if (!build_with_chromium) {
     ]
 
     configs += [ "..:common_config" ]
-    public_configs = [ "..:common_inherited_config"]
+    public_configs = [ "..:common_inherited_config" ]
 
     deps = [
       ":command_line_parser",
diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.cc b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
index f5608c8343..5c707bb6e3 100644
--- a/webrtc/tools/frame_analyzer/video_quality_analysis.cc
+++ b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
@@ -26,6 +26,9 @@ namespace test {
 
 using std::string;
 
+ResultsContainer::ResultsContainer() {}
+ResultsContainer::~ResultsContainer() {}
+
 int GetI420FrameSize(int width, int height) {
   int half_width = (width + 1) >> 1;
   int half_height = (height + 1) >> 1;
diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.h b/webrtc/tools/frame_analyzer/video_quality_analysis.h
index 4704a8cde9..49b6f1210e 100644
--- a/webrtc/tools/frame_analyzer/video_quality_analysis.h
+++ b/webrtc/tools/frame_analyzer/video_quality_analysis.h
@@ -32,6 +32,9 @@ struct AnalysisResult {
 };
 
 struct ResultsContainer {
+  ResultsContainer();
+  ~ResultsContainer();
+
   std::vector<AnalysisResult> frames;
 };
 
diff --git a/webrtc/tools/internal_tools.gyp b/webrtc/tools/internal_tools.gyp
index 9d5fe25dac..40dc371a06 100644
--- a/webrtc/tools/internal_tools.gyp
+++ b/webrtc/tools/internal_tools.gyp
@@ -20,6 +20,9 @@
         'simple_command_line_parser.h',
         'simple_command_line_parser.cc',
       ],
+      'deps': [
+        '<(webrtc_root)/common.gyp:gtest_prod',
+      ],
     }, # command_line_parser
   ],
-}
\ No newline at end of file
+}