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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 148643002: Hide X11 dependencies when use_x11=0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 3425 matching lines...) Expand 10 before | Expand all | Expand 10 after
3436 ], 3436 ],
3437 }], 3437 }],
3438 ], 3438 ],
3439 }], 3439 }],
3440 ['OS=="linux"', { 3440 ['OS=="linux"', {
3441 'conditions': [ 3441 'conditions': [
3442 ['use_aura==1', { 3442 ['use_aura==1', {
3443 'dependencies': [ 3443 'dependencies': [
3444 '../build/linux/system.gyp:dbus', 3444 '../build/linux/system.gyp:dbus',
3445 '../build/linux/system.gyp:fontconfig', 3445 '../build/linux/system.gyp:fontconfig',
3446 '../build/linux/system.gyp:x11',
3447 '../dbus/dbus.gyp:dbus', 3446 '../dbus/dbus.gyp:dbus',
3448 ], 3447 ],
3449 'sources/': [ 3448 'sources/': [
3450 ['exclude', '^browser/platform_util_common_linux.cc'], 3449 ['exclude', '^browser/platform_util_common_linux.cc'],
3451 ], 3450 ],
3452 }], 3451 }],
3453 # GTK build only 3452 # GTK build only
3454 ['toolkit_uses_gtk==1', { 3453 ['toolkit_uses_gtk==1', {
3455 'sources/': [ 3454 'sources/': [
3456 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], 3455 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
3457 ], 3456 ],
3458 }], 3457 }],
3458 # x11 build
3459 ['use_x11==1', {
3460 'dependencies': [
3461 '../build/linux/system.gyp:x11',
sky 2014/01/28 00:43:07 nit: indent this.
kalyank 2014/01/28 01:18:47 Done.
3462 ],
3463 }],
3459 ], 3464 ],
3460 }], 3465 }],
3461 ['enable_plugin_installation==0', { 3466 ['enable_plugin_installation==0', {
3462 'sources!': [ 3467 'sources!': [
3463 'browser/plugins/plugin_installer.cc', 3468 'browser/plugins/plugin_installer.cc',
3464 'browser/plugins/plugin_installer.h', 3469 'browser/plugins/plugin_installer.h',
3465 'browser/plugins/plugin_installer_observer.cc', 3470 'browser/plugins/plugin_installer_observer.cc',
3466 'browser/plugins/plugin_installer_observer.h', 3471 'browser/plugins/plugin_installer_observer.h',
3467 'browser/plugins/plugins_resource_service.cc', 3472 'browser/plugins/plugins_resource_service.cc',
3468 'browser/plugins/plugins_resource_service.h', 3473 'browser/plugins/plugins_resource_service.h',
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
3701 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3706 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3702 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3707 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3703 }, 3708 },
3704 'includes': [ '../build/android/java_cpp_template.gypi' ], 3709 'includes': [ '../build/android/java_cpp_template.gypi' ],
3705 }, 3710 },
3706 ], 3711 ],
3707 }, 3712 },
3708 ], 3713 ],
3709 ], 3714 ],
3710 } 3715 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698