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

Side by Side Diff: Source/platform/blink_platform.gyp

Issue 122653004: depend on fontconfig when building for linux rather than x11 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 | « no previous file | 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 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 }], 384 }],
385 ['OS=="android"', { 385 ['OS=="android"', {
386 'sources/': [ 386 'sources/': [
387 ['include', '^fonts/VDMXParser\\.cpp$'], 387 ['include', '^fonts/VDMXParser\\.cpp$'],
388 ], 388 ],
389 }, { # OS!="android" 389 }, { # OS!="android"
390 'sources/': [ 390 'sources/': [
391 ['exclude', 'Android\\.cpp$'], 391 ['exclude', 'Android\\.cpp$'],
392 ], 392 ],
393 }], 393 }],
394 ['use_x11 == 1', { 394 ['OS=="linux"', {
395 'dependencies': [ 395 'dependencies': [
396 '<(DEPTH)/build/linux/system.gyp:fontconfig', 396 '<(DEPTH)/build/linux/system.gyp:fontconfig',
397 ], 397 ],
398 'export_dependent_settings': [ 398 'export_dependent_settings': [
399 '<(DEPTH)/build/linux/system.gyp:fontconfig', 399 '<(DEPTH)/build/linux/system.gyp:fontconfig',
400 ], 400 ],
401 }], 401 }],
402 ['use_default_render_theme==1', { 402 ['use_default_render_theme==1', {
403 'sources/': [ 403 'sources/': [
404 ['exclude', 'scroll/ScrollbarThemeWin\\.(cpp|h)'], 404 ['exclude', 'scroll/ScrollbarThemeWin\\.(cpp|h)'],
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ['OS=="android"', { 462 ['OS=="android"', {
463 'cflags!': ['-mthumb'], 463 'cflags!': ['-mthumb'],
464 }], 464 }],
465 ], 465 ],
466 },{ # target_arch!="arm" 466 },{ # target_arch!="arm"
467 'type': 'none', 467 'type': 'none',
468 }], 468 }],
469 ], 469 ],
470 }], 470 }],
471 } 471 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698