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

Side by Side Diff: webrtc/webrtc_examples.gyp

Issue 2026223002: Remove metrics_default from rtc_media dependencies. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add Android and Mac/iOS specific dependencies Created 4 years, 6 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/sdk/sdk_tests.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 '../talk/build/common.gypi', 10 '../talk/build/common.gypi',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 'examples/peerconnection/client/conductor.cc', 73 'examples/peerconnection/client/conductor.cc',
74 'examples/peerconnection/client/conductor.h', 74 'examples/peerconnection/client/conductor.h',
75 'examples/peerconnection/client/defaults.cc', 75 'examples/peerconnection/client/defaults.cc',
76 'examples/peerconnection/client/defaults.h', 76 'examples/peerconnection/client/defaults.h',
77 'examples/peerconnection/client/peer_connection_client.cc', 77 'examples/peerconnection/client/peer_connection_client.cc',
78 'examples/peerconnection/client/peer_connection_client.h', 78 'examples/peerconnection/client/peer_connection_client.h',
79 ], 79 ],
80 'dependencies': [ 80 'dependencies': [
81 'api/api.gyp:libjingle_peerconnection', 81 'api/api.gyp:libjingle_peerconnection',
82 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 82 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
83 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
83 ], 84 ],
84 'conditions': [ 85 'conditions': [
85 ['build_json==1', { 86 ['build_json==1', {
86 'dependencies': [ 87 'dependencies': [
87 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', 88 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
88 ], 89 ],
89 }], 90 }],
90 # TODO(ronghuawu): Move these files to a win/ directory then they 91 # TODO(ronghuawu): Move these files to a win/ directory then they
91 # can be excluded automatically. 92 # can be excluded automatically.
92 ['OS=="win"', { 93 ['OS=="win"', {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 }], # OS=="linux" or OS=="win" 150 }], # OS=="linux" or OS=="win"
150 151
151 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 152 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
152 'targets': [ 153 'targets': [
153 { 154 {
154 'target_name': 'apprtc_common', 155 'target_name': 'apprtc_common',
155 'type': 'static_library', 156 'type': 'static_library',
156 'dependencies': [ 157 'dependencies': [
157 '<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_common_objc', 158 '<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_common_objc',
158 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 159 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
160 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
159 ], 161 ],
160 'sources': [ 162 'sources': [
161 'examples/objc/AppRTCDemo/common/ARDUtilities.h', 163 'examples/objc/AppRTCDemo/common/ARDUtilities.h',
162 'examples/objc/AppRTCDemo/common/ARDUtilities.m', 164 'examples/objc/AppRTCDemo/common/ARDUtilities.m',
163 ], 165 ],
164 'include_dirs': [ 166 'include_dirs': [
165 'examples/objc/AppRTCDemo/common', 167 'examples/objc/AppRTCDemo/common',
166 ], 168 ],
167 'direct_dependent_settings': { 169 'direct_dependent_settings': {
168 'include_dirs': [ 170 'include_dirs': [
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 }, 483 },
482 'includes': [ 484 'includes': [
483 '../build/host_jar.gypi', 485 '../build/host_jar.gypi',
484 '../build/android/test_runner.gypi', 486 '../build/android/test_runner.gypi',
485 ], 487 ],
486 }, 488 },
487 ], # targets 489 ], # targets
488 }], # OS=="android" 490 }], # OS=="android"
489 ], 491 ],
490 } 492 }
OLDNEW
« no previous file with comments | « webrtc/sdk/sdk_tests.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698