Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1433)

Unified Diff: webrtc/webrtc.gyp

Issue 1250383003: Revert "Renamed the ACMDump to RtcEventLog and moved it to webrtc/video, since it is not specific t… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/rtc_event_log_unittest.cc ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/webrtc.gyp
diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp
index de4f3ab145062f230487f28f5b5ac505cd710f28..fef36871afcb8773d3f8276967e26c99f600775c 100644
--- a/webrtc/webrtc.gyp
+++ b/webrtc/webrtc.gyp
@@ -16,21 +16,6 @@
'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',
@@ -95,7 +80,6 @@
'dependencies': [
'common.gyp:*',
'<@(webrtc_video_dependencies)',
- 'rtc_event_log',
],
'conditions': [
# TODO(andresp): Chromium libpeerconnection should link directly with
@@ -108,26 +92,5 @@
}],
],
},
- {
- 'target_name': 'rtc_event_log',
- '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',
- ],
- }],
- ],
- },
-
],
}
« no previous file with comments | « webrtc/video/rtc_event_log_unittest.cc ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698