Includes webrtc/build/protoc.gypi instead of build/protoc.gypi

webrtc/webrtc.gyp

Index: webrtc/webrtc.gyp
diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp
index fef36871afcb8773d3f8276967e26c99f600775c..49a66c34033fac0245c266f61c83485a593c4025 100644
--- a/webrtc/webrtc.gyp
+++ b/webrtc/webrtc.gyp
@@ -16,6 +16,21 @@
         'webrtc_tests.gypi',
       ],
     }],
+    ['enable_protobuf==1', {
+      'targets': [
+        {
+          # This target should only be built if enable_protobuf is defined
+          'target_name': 'rtc_event_log_proto',
+          'type': 'static_library',
+          'sources': ['video/rtc_event_log.proto',],
+          'variables': {
+            'proto_in_dir': 'video',
+            'proto_out_dir': 'webrtc/video',
+          },
+        'includes': ['build/protoc.gypi'],
+        },
+      ],
+    }],
   ],
   'includes': [
     'build/common.gypi',
@@ -80,6 +95,7 @@
       'dependencies': [
         'common.gyp:*',
         '<@(webrtc_video_dependencies)',
+        'rtc_event_log',
       ],
       'conditions': [
         # TODO(andresp): Chromium libpeerconnection should link directly with
@@ -92,5 +108,26 @@
         }],
       ],
     },
+    {
+      'target_name': 'rtc_event_log',

[kjellander_webrtc, 2015/09/15 13:26:33]

Putting this target here, combined with
https://codereview.webrtc.org/1267683002/ introduces more circular dependencies
to WebRTC, which something we would rather try to get rid of (see
https://code.google.com/p/webrtc/issues/detail?id=4243).

Is it maybe possible to move the rtc_event_log into webrtc/tools instead?

+      'type': 'static_library',
+      'sources': [
+        'video/rtc_event_log.cc',
+        'video/rtc_event_log.h',
+      ],
+      '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.
+        ['enable_protobuf==1', {
+          'dependencies': [
+            'rtc_event_log_proto',
+          ],
+          'defines': [
+            'ENABLE_RTC_EVENT_LOG',
+          ],
+        }],
+      ],
+    },
+
   ],
 }