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

Side by Side Diff: third_party/libjingle/libjingle_common.gypi

Issue 2082473002: Move third_party/libjingle/overrides to third_party/webrtc_overrides (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'nacl_untrusted_build%': 0, 7 'nacl_untrusted_build%': 0,
8 'webrtc_p2p': "../webrtc/p2p", 8 'webrtc_p2p': "../webrtc/p2p",
9 'webrtc_xmpp': "../webrtc/libjingle/xmpp", 9 'webrtc_xmpp': "../webrtc/libjingle/xmpp",
10 }, 10 },
11 'sources': [ 11 'sources': [
12 'overrides/field_trial.cc', 12 '../webrtc_overrides/field_trial.cc',
13 '<(webrtc_p2p)/base/asyncstuntcpsocket.cc', 13 '<(webrtc_p2p)/base/asyncstuntcpsocket.cc',
14 '<(webrtc_p2p)/base/asyncstuntcpsocket.h', 14 '<(webrtc_p2p)/base/asyncstuntcpsocket.h',
15 '<(webrtc_p2p)/base/basicpacketsocketfactory.cc', 15 '<(webrtc_p2p)/base/basicpacketsocketfactory.cc',
16 '<(webrtc_p2p)/base/basicpacketsocketfactory.h', 16 '<(webrtc_p2p)/base/basicpacketsocketfactory.h',
17 '<(webrtc_p2p)/base/candidate.h', 17 '<(webrtc_p2p)/base/candidate.h',
18 '<(webrtc_p2p)/base/common.h', 18 '<(webrtc_p2p)/base/common.h',
19 '<(webrtc_p2p)/base/dtlstransport.h', 19 '<(webrtc_p2p)/base/dtlstransport.h',
20 '<(webrtc_p2p)/base/dtlstransportchannel.cc', 20 '<(webrtc_p2p)/base/dtlstransportchannel.cc',
21 '<(webrtc_p2p)/base/dtlstransportchannel.h', 21 '<(webrtc_p2p)/base/dtlstransportchannel.h',
22 '<(webrtc_p2p)/base/p2pconstants.cc', 22 '<(webrtc_p2p)/base/p2pconstants.cc',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 ], 106 ],
107 }], 107 }],
108 ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', { 108 ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', {
109 'sources/': [ 109 'sources/': [
110 ['exclude', '/mac[a-z]+\\.(h|cc)$'], 110 ['exclude', '/mac[a-z]+\\.(h|cc)$'],
111 ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'], 111 ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
112 ], 112 ],
113 }], 113 }],
114 ], 114 ],
115 } 115 }
OLDNEW
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698