From 7bb6e75723eb64af079446cc6e3ff08c74fe02e4 Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Wed, 18 May 2016 04:06:15 -0700
Subject: [PATCH] Add missing headers and fix some missing dependencies

This is the first CL in a series of major cleanup and dependency
corrections needed in order to satisfy 'gn check'.

BUG=webrtc:4243, webrtc:5589
NOTRY=True

Review-Url: https://codereview.webrtc.org/1990593002
Cr-Commit-Position: refs/heads/master@{#12790}
---
 webrtc/BUILD.gn   | 10 +++++++++-
 webrtc/common.gyp |  3 ++-
 webrtc/webrtc.gyp |  6 +++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 01fa042af3..1b209dda6a 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -173,9 +173,14 @@ config("common_config") {
 
 source_set("webrtc") {
   sources = [
+    "audio_receive_stream.h",
+    "audio_send_stream.h",
+    "audio_state.h",
     "call.h",
-    "config.h",
+    "common.h",
     "transport.h",
+    "video_receive_stream.h",
+    "video_send_stream.h",
   ]
 
   defines = []
@@ -236,6 +241,7 @@ source_set("webrtc_common") {
     "config.h",
     "engine_configurations.h",
     "typedefs.h",
+    "video_frame.h",
   ]
 
   configs += [ ":common_config" ]
@@ -271,6 +277,7 @@ source_set("rtc_event_log") {
 
   deps = [
     ":webrtc_common",
+    "base:rtc_base_approved",
   ]
 
   if (rtc_enable_protobuf) {
@@ -297,6 +304,7 @@ if (rtc_enable_protobuf) {
     deps = [
       ":rtc_event_log_proto",
       ":webrtc_common",
+      "base:rtc_base_approved",
     ]
 
     if (is_clang && !is_nacl) {
diff --git a/webrtc/common.gyp b/webrtc/common.gyp
index 2970877309..4a111d0587 100644
--- a/webrtc/common.gyp
+++ b/webrtc/common.gyp
@@ -15,10 +15,11 @@
         'audio_sink.h',
         'common_types.cc',
         'common_types.h',
-        'config.h',
         'config.cc',
+        'config.h',
         'engine_configurations.h',
         'typedefs.h',
+        'video_frame.h',
       ],
     },
   ],
diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp
index 793bf96335..7f9a9ea840 100644
--- a/webrtc/webrtc.gyp
+++ b/webrtc/webrtc.gyp
@@ -78,6 +78,7 @@
           ],
           'dependencies': [
             'rtc_event_log_proto',
+            '<(webrtc_root)/base/base.gyp:rtc_base_approved',
           ],
           'export_dependent_settings': [
             'rtc_event_log_proto',
@@ -143,7 +144,7 @@
         'audio_send_stream.h',
         'audio_state.h',
         'call.h',
-        'config.h',
+        'common.h',
         'transport.h',
         'video_receive_stream.h',
         'video_send_stream.h',
@@ -178,6 +179,9 @@
         'call/rtc_event_log_helper_thread.cc',
         'call/rtc_event_log_helper_thread.h',
       ],
+      'dependencies': [
+        '<(webrtc_root)/base/base.gyp:rtc_base_approved',
+      ],
       'conditions': [
         # If enable_protobuf is defined, we want to compile the protobuf
         # and add rtc_event_log.pb.h and rtc_event_log.pb.cc to the sources.