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

Side by Side 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, 4 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 { 8 {
9 'conditions': [ 9 'conditions': [
10 ['include_tests==1', { 10 ['include_tests==1', {
11 'includes': [ 11 'includes': [
12 'libjingle/xmllite/xmllite_tests.gypi', 12 'libjingle/xmllite/xmllite_tests.gypi',
13 'libjingle/xmpp/xmpp_tests.gypi', 13 'libjingle/xmpp/xmpp_tests.gypi',
14 'p2p/p2p_tests.gypi', 14 'p2p/p2p_tests.gypi',
15 'sound/sound_tests.gypi', 15 'sound/sound_tests.gypi',
16 'webrtc_tests.gypi', 16 'webrtc_tests.gypi',
17 ], 17 ],
18 }], 18 }],
19 ['enable_protobuf==1', {
20 'targets': [
21 {
22 # This target should only be built if enable_protobuf is defined
23 'target_name': 'rtc_event_log_proto',
24 'type': 'static_library',
25 'sources': ['video/rtc_event_log.proto',],
26 'variables': {
27 'proto_in_dir': 'video',
28 'proto_out_dir': 'webrtc/video',
29 },
30 'includes': ['../build/protoc.gypi'],
31 },
32 ],
33 }],
34 ], 19 ],
35 'includes': [ 20 'includes': [
36 'build/common.gypi', 21 'build/common.gypi',
37 'video/webrtc_video.gypi', 22 'video/webrtc_video.gypi',
38 ], 23 ],
39 'variables': { 24 'variables': {
40 'webrtc_all_dependencies': [ 25 'webrtc_all_dependencies': [
41 'base/base.gyp:*', 26 'base/base.gyp:*',
42 'sound/sound.gyp:*', 27 'sound/sound.gyp:*',
43 'common.gyp:*', 28 'common.gyp:*',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 'transport.h', 73 'transport.h',
89 'video_receive_stream.h', 74 'video_receive_stream.h',
90 'video_renderer.h', 75 'video_renderer.h',
91 'video_send_stream.h', 76 'video_send_stream.h',
92 77
93 '<@(webrtc_video_sources)', 78 '<@(webrtc_video_sources)',
94 ], 79 ],
95 'dependencies': [ 80 'dependencies': [
96 'common.gyp:*', 81 'common.gyp:*',
97 '<@(webrtc_video_dependencies)', 82 '<@(webrtc_video_dependencies)',
98 'rtc_event_log',
99 ], 83 ],
100 'conditions': [ 84 'conditions': [
101 # TODO(andresp): Chromium libpeerconnection should link directly with 85 # TODO(andresp): Chromium libpeerconnection should link directly with
102 # this and no if conditions should be needed on webrtc build files. 86 # this and no if conditions should be needed on webrtc build files.
103 ['build_with_chromium==1', { 87 ['build_with_chromium==1', {
104 'dependencies': [ 88 'dependencies': [
105 '<(webrtc_root)/modules/modules.gyp:video_capture', 89 '<(webrtc_root)/modules/modules.gyp:video_capture',
106 '<(webrtc_root)/modules/modules.gyp:video_render', 90 '<(webrtc_root)/modules/modules.gyp:video_render',
107 ], 91 ],
108 }], 92 }],
109 ], 93 ],
110 }, 94 },
111 {
112 'target_name': 'rtc_event_log',
113 'type': 'static_library',
114 'sources': [
115 'video/rtc_event_log.cc',
116 'video/rtc_event_log.h',
117 ],
118 'conditions': [
119 # If enable_protobuf is defined, we want to compile the protobuf
120 # and add rtc_event_log.pb.h and rtc_event_log.pb.cc to the sources.
121 ['enable_protobuf==1', {
122 'dependencies': [
123 'rtc_event_log_proto',
124 ],
125 'defines': [
126 'ENABLE_RTC_EVENT_LOG',
127 ],
128 }],
129 ],
130 },
131
132 ], 95 ],
133 } 96 }
OLDNEW
« 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