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

Side by Side Diff: webrtc/api/api.gyp

Issue 2263063002: Revert of Add field_trial_default dependency to libjingle_peerconnection (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 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/api/BUILD.gn ('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) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 12 matching lines...) Expand all
23 ], 23 ],
24 }], 24 }],
25 # Excluded from the Chromium build since they cannot be built due to 25 # Excluded from the Chromium build since they cannot be built due to
26 # incompability with Chromium's logging implementation. 26 # incompability with Chromium's logging implementation.
27 ['OS=="android" and build_with_chromium==0', { 27 ['OS=="android" and build_with_chromium==0', {
28 'targets': [ 28 'targets': [
29 { 29 {
30 'target_name': 'libjingle_peerconnection_jni', 30 'target_name': 'libjingle_peerconnection_jni',
31 'type': 'static_library', 31 'type': 'static_library',
32 'dependencies': [ 32 'dependencies': [
33 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
33 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' , 34 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
34 'libjingle_peerconnection', 35 'libjingle_peerconnection',
35 ], 36 ],
36 'sources': [ 37 'sources': [
37 'android/jni/androidmediacodeccommon.h', 38 'android/jni/androidmediacodeccommon.h',
38 'android/jni/androidmediadecoder_jni.cc', 39 'android/jni/androidmediadecoder_jni.cc',
39 'android/jni/androidmediadecoder_jni.h', 40 'android/jni/androidmediadecoder_jni.h',
40 'android/jni/androidmediaencoder_jni.cc', 41 'android/jni/androidmediaencoder_jni.cc',
41 'android/jni/androidmediaencoder_jni.h', 42 'android/jni/androidmediaencoder_jni.h',
42 'android/jni/androidmetrics_jni.cc', 43 'android/jni/androidmetrics_jni.cc',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 ] 94 ]
94 }], 95 }],
95 ], # conditions 96 ], # conditions
96 'targets': [ 97 'targets': [
97 { 98 {
98 'target_name': 'libjingle_peerconnection', 99 'target_name': 'libjingle_peerconnection',
99 'type': 'static_library', 100 'type': 'static_library',
100 'dependencies': [ 101 'dependencies': [
101 '<(webrtc_root)/media/media.gyp:rtc_media', 102 '<(webrtc_root)/media/media.gyp:rtc_media',
102 '<(webrtc_root)/pc/pc.gyp:rtc_pc', 103 '<(webrtc_root)/pc/pc.gyp:rtc_pc',
103 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default' ,
104 ], 104 ],
105 'sources': [ 105 'sources': [
106 'audiotrack.cc', 106 'audiotrack.cc',
107 'audiotrack.h', 107 'audiotrack.h',
108 'datachannel.cc', 108 'datachannel.cc',
109 'datachannel.h', 109 'datachannel.h',
110 'datachannelinterface.h', 110 'datachannelinterface.h',
111 'dtlsidentitystore.h', 111 'dtlsidentitystore.h',
112 'dtmfsender.cc', 112 'dtmfsender.cc',
113 'dtmfsender.h', 113 'dtmfsender.h',
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 'quicdatatransport.h', 194 'quicdatatransport.h',
195 ], 195 ],
196 'export_dependent_settings': [ 196 'export_dependent_settings': [
197 '<(DEPTH)/third_party/libquic/libquic.gyp:libquic', 197 '<(DEPTH)/third_party/libquic/libquic.gyp:libquic',
198 ], 198 ],
199 }], 199 }],
200 ], 200 ],
201 }, # target libjingle_peerconnection 201 }, # target libjingle_peerconnection
202 ], # targets 202 ], # targets
203 } 203 }
OLDNEW
« no previous file with comments | « webrtc/api/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698