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

Side by Side Diff: third_party/libjingle/libjingle_nacl.gyp

Issue 293983009: Fixes dependency ordering to get libjingle style overrides working for webrtc. See http://chromegw.… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « third_party/libjingle/libjingle.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 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 'libjingle_source': "source", 7 'libjingle_source': "source",
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../../native_client/build/untrusted.gypi', 10 '../../native_client/build/untrusted.gypi',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'includes': ['libjingle_common.gypi', ], 57 'includes': ['libjingle_common.gypi', ],
58 'sources!': [ 58 'sources!': [
59 # Compiled as part of libjingle_p2p_constants_nacl. 59 # Compiled as part of libjingle_p2p_constants_nacl.
60 '<(libjingle_source)/talk/p2p/base/constants.cc', 60 '<(libjingle_source)/talk/p2p/base/constants.cc',
61 '<(libjingle_source)/talk/p2p/base/constants.h', 61 '<(libjingle_source)/talk/p2p/base/constants.h',
62 ], 62 ],
63 'direct_dependent_settings': { 63 'direct_dependent_settings': {
64 'include_dirs': [ 64 'include_dirs': [
65 './overrides', 65 './overrides',
66 './<(libjingle_source)', 66 './<(libjingle_source)',
67 '../../third_party/webrtc/overrides',
67 '../../testing/gtest/include', 68 '../../testing/gtest/include',
68 '../../third_party', 69 '../../third_party',
69 '../../third_party/webrtc', 70 '../../third_party/webrtc',
70 ], 71 ],
71 'defines': [ 72 'defines': [
72 'EXPAT_RELATIVE_PATH', 73 'EXPAT_RELATIVE_PATH',
73 'FEATURE_ENABLE_SSL', 74 'FEATURE_ENABLE_SSL',
74 'GTEST_RELATIVE_PATH', 75 'GTEST_RELATIVE_PATH',
75 'NO_MAIN_THREAD_WRAPPING', 76 'NO_MAIN_THREAD_WRAPPING',
76 'NO_SOUND_SYSTEM', 77 'NO_SOUND_SYSTEM',
(...skipping 29 matching lines...) Expand all
106 'include_dirs': [ 107 'include_dirs': [
107 './<(libjingle_source)', 108 './<(libjingle_source)',
108 ], 109 ],
109 'sources': [ 110 'sources': [
110 '<(libjingle_source)/talk/p2p/base/constants.cc', 111 '<(libjingle_source)/talk/p2p/base/constants.cc',
111 '<(libjingle_source)/talk/p2p/base/constants.h', 112 '<(libjingle_source)/talk/p2p/base/constants.h',
112 ], 113 ],
113 }, # end of target 'libjingle_p2p_constants_nacl' 114 }, # end of target 'libjingle_p2p_constants_nacl'
114 ], 115 ],
115 } 116 }
OLDNEW
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698