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

Side by Side Diff: jingle/jingle.gyp

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 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 | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | media/media.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, # variables 8 }, # variables
9 'conditions': [ 9 'conditions': [
10 ['enable_webrtc==1 or OS!="android"', { 10 ['enable_webrtc==1 or OS!="android"', {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 'notifier/listener/xml_element_util.cc', 98 'notifier/listener/xml_element_util.cc',
99 'notifier/listener/xml_element_util.h', 99 'notifier/listener/xml_element_util.h',
100 'notifier/listener/xmpp_push_client.cc', 100 'notifier/listener/xmpp_push_client.cc',
101 'notifier/listener/xmpp_push_client.h', 101 'notifier/listener/xmpp_push_client.h',
102 ], 102 ],
103 'defines' : [ 103 'defines' : [
104 '_CRT_SECURE_NO_WARNINGS', 104 '_CRT_SECURE_NO_WARNINGS',
105 ], 105 ],
106 'dependencies': [ 106 'dependencies': [
107 '../base/base.gyp:base', 107 '../base/base.gyp:base',
108 '../build/temp_gyp/googleurl.gyp:googleurl',
109 '../net/net.gyp:net', 108 '../net/net.gyp:net',
110 '../third_party/expat/expat.gyp:expat', 109 '../third_party/expat/expat.gyp:expat',
111 '../third_party/libjingle/libjingle.gyp:libjingle', 110 '../third_party/libjingle/libjingle.gyp:libjingle',
111 '../url/url.gyp:url_lib',
112 'jingle_glue', 112 'jingle_glue',
113 ], 113 ],
114 'export_dependent_settings': [ 114 'export_dependent_settings': [
115 '../third_party/libjingle/libjingle.gyp:libjingle', 115 '../third_party/libjingle/libjingle.gyp:libjingle',
116 ], 116 ],
117 'conditions': [ 117 'conditions': [
118 ['toolkit_uses_gtk == 1', { 118 ['toolkit_uses_gtk == 1', {
119 'dependencies': [ 119 'dependencies': [
120 '../build/linux/system.gyp:gtk' 120 '../build/linux/system.gyp:gtk'
121 ], 121 ],
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 ], 240 ],
241 }, 241 },
242 { 242 {
243 'target_name': 'notifier_test_util', 243 'target_name': 'notifier_test_util',
244 'type': 'none', 244 'type': 'none',
245 }, 245 },
246 ], 246 ],
247 }], 247 }],
248 ], 248 ],
249 } 249 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698