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

Side by Side Diff: content/content_browser.gypi

Issue 12563002: x11: Include X11 dependencies only when building with X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | Annotate | Revision Log
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 'browser/speech/proto/speech_proto.gyp:speech_proto', 7 'browser/speech/proto/speech_proto.gyp:speech_proto',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../google_apis/google_apis.gyp:google_apis', 10 '../google_apis/google_apis.gyp:google_apis',
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 'defines': [ 1083 'defines': [
1084 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"', 1084 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
1085 ], 1085 ],
1086 }], 1086 }],
1087 ], 1087 ],
1088 }], 1088 }],
1089 ['OS=="linux" and use_aura==1', { 1089 ['OS=="linux" and use_aura==1', {
1090 'dependencies': [ 1090 'dependencies': [
1091 '../build/linux/system.gyp:dbus', 1091 '../build/linux/system.gyp:dbus',
1092 '../build/linux/system.gyp:fontconfig', 1092 '../build/linux/system.gyp:fontconfig',
1093 '../dbus/dbus.gyp:dbus',
1094 ],
1095 }],
1096 ['use_x11==1', {
1097 'dependencies': [
1093 '../build/linux/system.gyp:x11', 1098 '../build/linux/system.gyp:x11',
1094 '../dbus/dbus.gyp:dbus',
1095 ], 1099 ],
1096 }], 1100 }],
1097 ['OS=="android"', { 1101 ['OS=="android"', {
1098 'dependencies': [ 1102 'dependencies': [
1099 '../media/media.gyp:media', 1103 '../media/media.gyp:media',
1100 'content.gyp:content_jni_headers', 1104 'content.gyp:content_jni_headers',
1101 ], 1105 ],
1102 'link_settings': { 1106 'link_settings': {
1103 'libraries': [ 1107 'libraries': [
1104 '-ljnigraphics', 1108 '-ljnigraphics',
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1232 ['exclude', '^browser/speech/'], 1236 ['exclude', '^browser/speech/'],
1233 ], 1237 ],
1234 }], 1238 }],
1235 ['linux_use_libgps==1', { 1239 ['linux_use_libgps==1', {
1236 'dependencies': [ 1240 'dependencies': [
1237 '../build/linux/system.gyp:libgps', 1241 '../build/linux/system.gyp:libgps',
1238 ], 1242 ],
1239 }], 1243 }],
1240 ], 1244 ],
1241 } 1245 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | content/content_plugin.gypi » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698