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

Side by Side Diff: build/linux/system.gyp

Issue 20910002: Revert r214000 to reland r213996. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add explicit glib-object.h include Created 7 years, 4 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 | « no previous file | tools/heapcheck/suppressions.txt » ('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 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
10 }, { 10 }, {
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 ], 775 ],
776 }, 776 },
777 { 777 {
778 'target_name': 'pangocairo', 778 'target_name': 'pangocairo',
779 'type': 'none', 779 'type': 'none',
780 'toolsets': ['host', 'target'], 780 'toolsets': ['host', 'target'],
781 'conditions': [ 781 'conditions': [
782 ['_toolset=="target"', { 782 ['_toolset=="target"', {
783 'direct_dependent_settings': { 783 'direct_dependent_settings': {
784 'cflags': [ 784 'cflags': [
785 '<!@(<(pkg-config) --cflags pangocairo)', 785 '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
786 ], 786 ],
787 }, 787 },
788 'link_settings': { 788 'link_settings': {
789 'ldflags': [ 789 'ldflags': [
790 '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo)', 790 '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pang oft2)',
791 ], 791 ],
792 'libraries': [ 792 'libraries': [
793 '<!@(<(pkg-config) --libs-only-l pangocairo)', 793 '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
794 ], 794 ],
795 }, 795 },
796 }, { 796 }, {
797 'direct_dependent_settings': { 797 'direct_dependent_settings': {
798 'cflags': [ 798 'cflags': [
799 '<!@(pkg-config --cflags pangocairo)', 799 '<!@(pkg-config --cflags pangocairo pangoft2)',
800 ], 800 ],
801 }, 801 },
802 'link_settings': { 802 'link_settings': {
803 'ldflags': [ 803 'ldflags': [
804 '<!@(pkg-config --libs-only-L --libs-only-other pangocairo)', 804 '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft 2)',
805 ], 805 ],
806 'libraries': [ 806 'libraries': [
807 '<!@(pkg-config --libs-only-l pangocairo)', 807 '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
808 ], 808 ],
809 }, 809 },
810 }], 810 }],
811 ], 811 ],
812 }, 812 },
813 { 813 {
814 'target_name': 'libresolv', 814 'target_name': 'libresolv',
815 'type': 'none', 815 'type': 'none',
816 'link_settings': { 816 'link_settings': {
817 'libraries': [ 817 'libraries': [
(...skipping 18 matching lines...) Expand all
836 ], 836 ],
837 'libraries': [ 837 'libraries': [
838 '<!@(<(pkg-config) --libs-only-l libudev)', 838 '<!@(<(pkg-config) --libs-only-l libudev)',
839 ], 839 ],
840 }, 840 },
841 }], 841 }],
842 ], 842 ],
843 }, 843 },
844 ], 844 ],
845 } 845 }
OLDNEW
« no previous file with comments | « no previous file | tools/heapcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698