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

Side by Side Diff: ui/ui.gyp

Issue 10386020: Revert r135533. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 | « ui/resources/ui_resources_touch.grd ('k') | webkit/glue/webcursor_aurax11.cc » ('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 }, 8 },
9 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 # font_gtk.cc uses fontconfig. 484 # font_gtk.cc uses fontconfig.
485 '../build/linux/system.gyp:fontconfig', 485 '../build/linux/system.gyp:fontconfig',
486 '../build/linux/system.gyp:glib', 486 '../build/linux/system.gyp:glib',
487 '../build/linux/system.gyp:pangocairo', 487 '../build/linux/system.gyp:pangocairo',
488 '../build/linux/system.gyp:x11', 488 '../build/linux/system.gyp:x11',
489 '../build/linux/system.gyp:xext', 489 '../build/linux/system.gyp:xext',
490 '../build/linux/system.gyp:xfixes', 490 '../build/linux/system.gyp:xfixes',
491 ], 491 ],
492 'link_settings': { 492 'link_settings': {
493 'libraries': [ 493 'libraries': [
494 '-lXcursor', # For XCursor* function calls in x11_util.cc.
495 '-lXrender', # For XRender* function calls in x11_util.cc. 494 '-lXrender', # For XRender* function calls in x11_util.cc.
496 ], 495 ],
497 }, 496 },
498 'conditions': [ 497 'conditions': [
499 ['toolkit_views==0', { 498 ['toolkit_views==0', {
500 # Note: because of gyp predence rules this has to be defined as 499 # Note: because of gyp predence rules this has to be defined as
501 # 'sources/' rather than 'sources!'. 500 # 'sources/' rather than 'sources!'.
502 'sources/': [ 501 'sources/': [
503 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'], 502 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'],
504 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'], 503 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'],
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 741 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
743 'os.chmod(\'<(ui_copy_dest)\', 0700)' 742 'os.chmod(\'<(ui_copy_dest)\', 0700)'
744 ] 743 ]
745 } 744 }
746 ], 745 ],
747 }, 746 },
748 ], 747 ],
749 }], 748 }],
750 ], 749 ],
751 } 750 }
OLDNEW
« no previous file with comments | « ui/resources/ui_resources_touch.grd ('k') | webkit/glue/webcursor_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698