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

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

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | « build/ios/grit_whitelist.txt ('k') | build/secondary/tools/grit/grit_rule.gni » ('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': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"', 9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"',
10 }, { 10 }, {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 'udev_set_log_priority', 84 'udev_set_log_priority',
85 'udev_unref', 85 'udev_unref',
86 ], 86 ],
87 }, 87 },
88 'conditions': [ 88 'conditions': [
89 [ 'chromeos==0 and use_ozone==0', { 89 [ 'chromeos==0 and use_ozone==0', {
90 # Hide GTK and related dependencies for Chrome OS and Ozone, so they won't get 90 # Hide GTK and related dependencies for Chrome OS and Ozone, so they won't get
91 # added back to Chrome OS and Ozone. Don't try to use GTK on Chrome OS and Ozone. 91 # added back to Chrome OS and Ozone. Don't try to use GTK on Chrome OS and Ozone.
92 'targets': [ 92 'targets': [
93 { 93 {
94 'target_name': 'atk',
95 'type': 'none',
96 'conditions': [
97 ['_toolset=="target"', {
98 'direct_dependent_settings': {
99 'cflags': [
100 '<!@(<(pkg-config) --cflags atk)',
101 ],
102 'defines': [
103 'ATK_LIB_DIR="<!@(<(pkg-config) --variable=libdir atk)"',
104 ],
105 },
106 'link_settings': {
107 'ldflags': [
108 '<!@(<(pkg-config) --libs-only-L --libs-only-other atk)',
109 ],
110 'libraries': [
111 '<!@(<(pkg-config) --libs-only-l atk)',
112 ],
113 },
114 }],
115 ],
116 },
117 {
94 'target_name': 'gdk', 118 'target_name': 'gdk',
95 'type': 'none', 119 'type': 'none',
96 'conditions': [ 120 'conditions': [
97 ['_toolset=="target"', { 121 ['_toolset=="target"', {
98 'direct_dependent_settings': { 122 'direct_dependent_settings': {
99 'cflags': [ 123 'cflags': [
100 '<!@(<(pkg-config) --cflags gdk-2.0)', 124 '<!@(<(pkg-config) --cflags gdk-2.0)',
101 ], 125 ],
102 }, 126 },
103 'link_settings': { 127 'link_settings': {
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 'ldflags': [ 525 'ldflags': [
502 '<!@(<(pkg-config) --libs-only-L --libs-only-other gbm)', 526 '<!@(<(pkg-config) --libs-only-L --libs-only-other gbm)',
503 ], 527 ],
504 'libraries': [ 528 'libraries': [
505 '<!@(<(pkg-config) --libs-only-l gbm)', 529 '<!@(<(pkg-config) --libs-only-l gbm)',
506 ], 530 ],
507 }, 531 },
508 }, 532 },
509 ], 533 ],
510 }], 534 }],
511 ['ozone_platform_dri==1 or ozone_platform_gbm==1', { 535 ['ozone_platform_dri==1 or ozone_platform_drm==1 or ozone_platform_gbm==1', {
512 'targets': [ 536 'targets': [
513 { 537 {
514 'target_name': 'libdrm', 538 'target_name': 'libdrm',
515 'type': 'none', 539 'type': 'none',
516 'direct_dependent_settings': { 540 'direct_dependent_settings': {
517 'cflags': [ 541 'cflags': [
518 '<!@(<(pkg-config) --cflags libdrm)', 542 '<!@(<(pkg-config) --cflags libdrm)',
519 ], 543 ],
520 }, 544 },
521 'link_settings': { 545 'link_settings': {
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 '-Wno-header-guard', 1212 '-Wno-header-guard',
1189 ], 1213 ],
1190 }, 1214 },
1191 }], 1215 }],
1192 ] 1216 ]
1193 }], 1217 }],
1194 ], 1218 ],
1195 }, 1219 },
1196 ], 1220 ],
1197 } 1221 }
OLDNEW
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | build/secondary/tools/grit/grit_rule.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698