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

Side by Side Diff: content/content_common.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/content_browser.gypi ('k') | ui/ui.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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../components/tracing.gyp:tracing', 9 '../components/tracing.gyp:tracing',
10 '../media/media.gyp:media', 10 '../media/media.gyp:media',
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 'common/fileapi/webfilewriter_impl.h', 186 'common/fileapi/webfilewriter_impl.h',
187 'common/find_match_rect_android.cc', 187 'common/find_match_rect_android.cc',
188 'common/find_match_rect_android.h', 188 'common/find_match_rect_android.h',
189 'common/font_cache_dispatcher_win.cc', 189 'common/font_cache_dispatcher_win.cc',
190 'common/font_cache_dispatcher_win.h', 190 'common/font_cache_dispatcher_win.h',
191 'common/font_config_ipc_linux.cc', 191 'common/font_config_ipc_linux.cc',
192 'common/font_config_ipc_linux.h', 192 'common/font_config_ipc_linux.h',
193 'common/font_list.cc', 193 'common/font_list.cc',
194 'common/font_list.h', 194 'common/font_list.h',
195 'common/font_list_android.cc', 195 'common/font_list_android.cc',
196 'common/font_list_linux.cc',
197 'common/font_list_mac.mm', 196 'common/font_list_mac.mm',
197 'common/font_list_pango.cc',
198 'common/font_list_win.cc', 198 'common/font_list_win.cc',
199 'common/gamepad_hardware_buffer.h', 199 'common/gamepad_hardware_buffer.h',
200 'common/gamepad_messages.h', 200 'common/gamepad_messages.h',
201 'common/gamepad_seqlock.cc', 201 'common/gamepad_seqlock.cc',
202 'common/gamepad_seqlock.h', 202 'common/gamepad_seqlock.h',
203 'common/gamepad_user_gesture.cc', 203 'common/gamepad_user_gesture.cc',
204 'common/gamepad_user_gesture.h', 204 'common/gamepad_user_gesture.h',
205 'common/geolocation_messages.h', 205 'common/geolocation_messages.h',
206 'common/gpu/client/command_buffer_proxy_impl.cc', 206 'common/gpu/client/command_buffer_proxy_impl.cc',
207 'common/gpu/client/command_buffer_proxy_impl.h', 207 'common/gpu/client/command_buffer_proxy_impl.h',
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 'dependencies': [ 420 'dependencies': [
421 'content.gyp:content_jni_headers', 421 'content.gyp:content_jni_headers',
422 'content.gyp:common_aidl', 422 'content.gyp:common_aidl',
423 ], 423 ],
424 }], 424 }],
425 ['toolkit_uses_gtk == 1', { 425 ['toolkit_uses_gtk == 1', {
426 'dependencies': [ 426 'dependencies': [
427 '../build/linux/system.gyp:gtk', 427 '../build/linux/system.gyp:gtk',
428 ], 428 ],
429 }], 429 }],
430 ['OS=="linux"', { 430 ['use_pango == 1', {
431 'dependencies': [ 431 'dependencies': [
432 '../build/linux/system.gyp:pangocairo', 432 '../build/linux/system.gyp:pangocairo',
433 ], 433 ],
434 }, { # use_pango == 0
435 'sources!': [
436 'common/font_list_pango.cc',
437 ],
434 }], 438 }],
435 ['use_x11 == 1', { 439 ['use_x11 == 1', {
436 'include_dirs': [ 440 'include_dirs': [
437 '<(DEPTH)/third_party/khronos', 441 '<(DEPTH)/third_party/khronos',
438 ], 442 ],
439 'link_settings': { 443 'link_settings': {
440 'libraries': [ 444 'libraries': [
441 '-lXcomposite', 445 '-lXcomposite',
442 ], 446 ],
443 }, 447 },
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 570 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
567 '<(output)', 571 '<(output)',
568 '<(PRODUCT_DIR)', 572 '<(PRODUCT_DIR)',
569 ], 573 ],
570 'msvs_cygwin_shell': 1, 574 'msvs_cygwin_shell': 1,
571 }, 575 },
572 ] 576 ]
573 }], 577 }],
574 ], 578 ],
575 } 579 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698