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

Side by Side Diff: webrtc/webrtc.gyp

Issue 2380683005: Moved RtcEventLog files from call/ to logging/ (new top level dir) (Closed)
Patch Set: Rebase to master Created 4 years, 2 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/voice_engine/voice_engine.gyp ('k') | no next file » | 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 'includes': [ 9 'includes': [
10 'build/common.gypi', 10 'build/common.gypi',
(...skipping 14 matching lines...) Expand all
25 25
26 '<@(webrtc_audio_sources)', 26 '<@(webrtc_audio_sources)',
27 '<@(webrtc_call_sources)', 27 '<@(webrtc_call_sources)',
28 '<@(webrtc_video_sources)', 28 '<@(webrtc_video_sources)',
29 ], 29 ],
30 'dependencies': [ 30 'dependencies': [
31 'common.gyp:*', 31 'common.gyp:*',
32 '<@(webrtc_audio_dependencies)', 32 '<@(webrtc_audio_dependencies)',
33 '<@(webrtc_call_dependencies)', 33 '<@(webrtc_call_dependencies)',
34 '<@(webrtc_video_dependencies)', 34 '<@(webrtc_video_dependencies)',
35 'rtc_event_log', 35 'rtc_event_log_impl',
36 ], 36 ],
37 'conditions': [ 37 'conditions': [
38 # TODO(andresp): Chromium should link directly with this and no if 38 # TODO(andresp): Chromium should link directly with this and no if
39 # conditions should be needed on webrtc build files. 39 # conditions should be needed on webrtc build files.
40 ['build_with_chromium==1', { 40 ['build_with_chromium==1', {
41 'dependencies': [ 41 'dependencies': [
42 '<(webrtc_root)/modules/modules.gyp:video_capture', 42 '<(webrtc_root)/modules/modules.gyp:video_capture',
43 ], 43 ],
44 }], 44 }],
45 ], 45 ],
46 }, 46 },
47 { 47 {
48 'target_name': 'rtc_event_log', 48 'target_name': 'rtc_event_log_api',
49 'type': 'static_library', 49 'type': 'static_library',
50 'sources': [ 50 'sources': [
51 'call/rtc_event_log.cc', 51 'logging/rtc_event_log/rtc_event_log.h',
52 'call/rtc_event_log.h', 52 ],
53 'call/rtc_event_log_helper_thread.cc', 53 },
54 'call/rtc_event_log_helper_thread.h', 54 {
55 'target_name': 'rtc_event_log_impl',
56 'type': 'static_library',
57 'sources': [
58 'logging/rtc_event_log/ringbuffer.h',
59 'logging/rtc_event_log/rtc_event_log.cc',
60 'logging/rtc_event_log/rtc_event_log_helper_thread.cc',
61 'logging/rtc_event_log/rtc_event_log_helper_thread.h',
55 ], 62 ],
56 'conditions': [ 63 'conditions': [
57 # If enable_protobuf is defined, we want to compile the protobuf 64 # If enable_protobuf is defined, we want to compile the protobuf
58 # and add rtc_event_log.pb.h and rtc_event_log.pb.cc to the sources. 65 # and add rtc_event_log.pb.h and rtc_event_log.pb.cc to the sources.
59 ['enable_protobuf==1', { 66 ['enable_protobuf==1', {
60 'dependencies': [ 67 'dependencies': [
68 'rtc_event_log_api',
61 'rtc_event_log_proto', 69 'rtc_event_log_proto',
62 ], 70 ],
63 'defines': [ 71 'defines': [
64 'ENABLE_RTC_EVENT_LOG', 72 'ENABLE_RTC_EVENT_LOG',
65 ], 73 ],
66 }], 74 }],
67 ], 75 ],
68 }, 76 },
69 ], # targets 77 ], # targets
70 'conditions': [ 78 'conditions': [
71 ['include_tests==1', { 79 ['include_tests==1', {
72 'includes': [ 80 'includes': [
73 'webrtc_tests.gypi', 81 'webrtc_tests.gypi',
74 ], 82 ],
75 }], 83 }],
76 ['enable_protobuf==1', { 84 ['enable_protobuf==1', {
77 'targets': [ 85 'targets': [
78 { 86 {
79 # This target should only be built if enable_protobuf is defined 87 # This target should only be built if enable_protobuf is defined
80 'target_name': 'rtc_event_log_proto', 88 'target_name': 'rtc_event_log_proto',
81 'type': 'static_library', 89 'type': 'static_library',
82 'sources': ['call/rtc_event_log.proto',], 90 'sources': ['logging/rtc_event_log/rtc_event_log.proto',],
83 'variables': { 91 'variables': {
84 'proto_in_dir': 'call', 92 'proto_in_dir': 'logging/rtc_event_log',
85 'proto_out_dir': 'webrtc/call', 93 'proto_out_dir': 'webrtc/logging/rtc_event_log',
86 }, 94 },
87 'includes': ['build/protoc.gypi'], 95 'includes': ['build/protoc.gypi'],
88 }, 96 },
89 { 97 {
90 'target_name': 'rtc_event_log_parser', 98 'target_name': 'rtc_event_log_parser',
91 'type': 'static_library', 99 'type': 'static_library',
92 'sources': [ 100 'sources': [
93 'call/rtc_event_log_parser.cc', 101 'logging/rtc_event_log/rtc_event_log_parser.cc',
94 'call/rtc_event_log_parser.h', 102 'logging/rtc_event_log/rtc_event_log_parser.h',
95 ], 103 ],
96 'dependencies': [ 104 'dependencies': [
97 'rtc_event_log_proto', 105 'rtc_event_log_proto',
98 ], 106 ],
99 'export_dependent_settings': [ 107 'export_dependent_settings': [
100 'rtc_event_log_proto', 108 'rtc_event_log_proto',
101 ], 109 ],
102 }, 110 },
103 ], 111 ],
104 }], 112 }],
105 ['include_tests==1 and enable_protobuf==1', { 113 ['include_tests==1 and enable_protobuf==1', {
106 'targets': [ 114 'targets': [
107 { 115 {
108 'target_name': 'rtc_event_log2rtp_dump', 116 'target_name': 'rtc_event_log2rtp_dump',
109 'type': 'executable', 117 'type': 'executable',
110 'sources': ['call/rtc_event_log2rtp_dump.cc',], 118 'sources': ['logging/rtc_event_log2rtp_dump.cc',],
111 'dependencies': [ 119 'dependencies': [
112 '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 120 '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
113 'rtc_event_log_parser', 121 'rtc_event_log_parser',
114 'rtc_event_log_proto', 122 'rtc_event_log_proto',
115 'test/test.gyp:rtp_test_utils' 123 'test/test.gyp:rtp_test_utils'
116 ], 124 ],
117 }, 125 },
118 ], 126 ],
119 }], 127 }],
120 ], # conditions 128 ], # conditions
121 } 129 }
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voice_engine.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698