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

Side by Side Diff: content/content_browser.gypi

Issue 15102010: untangle pango usage from use_x11 and OS==linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove stray unit test inclusion (bad rebase?) Created 7 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
« no previous file with comments | « content/common/font_list_pango.cc ('k') | content/content_common.gypi » ('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 'dependencies': [ 6 'dependencies': [
7 'browser/speech/proto/speech_proto.gyp:speech_proto', 7 'browser/speech/proto/speech_proto.gyp:speech_proto',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../google_apis/google_apis.gyp:google_apis', 10 '../google_apis/google_apis.gyp:google_apis',
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 '../build/linux/system.gyp:dbus', 1202 '../build/linux/system.gyp:dbus',
1203 '../build/linux/system.gyp:fontconfig', 1203 '../build/linux/system.gyp:fontconfig',
1204 '../dbus/dbus.gyp:dbus', 1204 '../dbus/dbus.gyp:dbus',
1205 ], 1205 ],
1206 }], 1206 }],
1207 ['use_x11==1', { 1207 ['use_x11==1', {
1208 'dependencies': [ 1208 'dependencies': [
1209 '../build/linux/system.gyp:x11', 1209 '../build/linux/system.gyp:x11',
1210 ], 1210 ],
1211 }], 1211 }],
1212 ['OS=="linux"', { 1212 ['use_pango==1', {
1213 'dependencies': [ 1213 'dependencies': [
1214 '../build/linux/system.gyp:pangocairo', 1214 '../build/linux/system.gyp:pangocairo',
1215 ], 1215 ],
1216 }], 1216 }],
1217 ['OS=="android"', { 1217 ['OS=="android"', {
1218 'dependencies': [ 1218 'dependencies': [
1219 '../media/media.gyp:media', 1219 '../media/media.gyp:media',
1220 'content.gyp:content_jni_headers', 1220 'content.gyp:content_jni_headers',
1221 ], 1221 ],
1222 'link_settings': { 1222 'link_settings': {
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 '../third_party/speex/speex.gyp:libspeex', 1365 '../third_party/speex/speex.gyp:libspeex',
1366 ], 1366 ],
1367 }], 1367 }],
1368 ['linux_use_libgps==1', { 1368 ['linux_use_libgps==1', {
1369 'dependencies': [ 1369 'dependencies': [
1370 '../build/linux/system.gyp:libgps', 1370 '../build/linux/system.gyp:libgps',
1371 ], 1371 ],
1372 }], 1372 }],
1373 ], 1373 ],
1374 } 1374 }
OLDNEW
« no previous file with comments | « content/common/font_list_pango.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698