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

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 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 'defines': [ 1091 'defines': [
1092 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"', 1092 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
1093 ], 1093 ],
1094 }], 1094 }],
1095 ], 1095 ],
1096 }], 1096 }],
1097 ['OS=="linux" and use_aura==1', { 1097 ['OS=="linux" and use_aura==1', {
1098 'dependencies': [ 1098 'dependencies': [
1099 '../build/linux/system.gyp:dbus', 1099 '../build/linux/system.gyp:dbus',
1100 '../build/linux/system.gyp:fontconfig', 1100 '../build/linux/system.gyp:fontconfig',
1101 '../dbus/dbus.gyp:dbus',
1102 ],
1103 }],
1104 ['use_x11==1', {
1105 'dependencies': [
1101 '../build/linux/system.gyp:x11', 1106 '../build/linux/system.gyp:x11',
1102 '../dbus/dbus.gyp:dbus',
1103 ], 1107 ],
1104 }], 1108 }],
1105 ['OS=="android"', { 1109 ['OS=="android"', {
1106 'dependencies': [ 1110 'dependencies': [
1107 '../media/media.gyp:media', 1111 '../media/media.gyp:media',
1108 'content.gyp:content_jni_headers', 1112 'content.gyp:content_jni_headers',
1109 ], 1113 ],
1110 'link_settings': { 1114 'link_settings': {
1111 'libraries': [ 1115 'libraries': [
1112 '-ljnigraphics', 1116 '-ljnigraphics',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 ['exclude', '^browser/speech/'], 1245 ['exclude', '^browser/speech/'],
1242 ], 1246 ],
1243 }], 1247 }],
1244 ['linux_use_libgps==1', { 1248 ['linux_use_libgps==1', {
1245 'dependencies': [ 1249 'dependencies': [
1246 '../build/linux/system.gyp:libgps', 1250 '../build/linux/system.gyp:libgps',
1247 ], 1251 ],
1248 }], 1252 }],
1249 ], 1253 ],
1250 } 1254 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/content_plugin.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698