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

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: Review Fix: remove blank lines 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
« no previous file with comments | « build/linux/system.gyp ('k') | chrome/chrome_browser_extensions.gypi » ('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 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 3434 matching lines...) Expand 10 before | Expand all | Expand 10 after
3445 ], 3445 ],
3446 }], 3446 }],
3447 ], 3447 ],
3448 }], 3448 }],
3449 ['OS=="linux"', { 3449 ['OS=="linux"', {
3450 'conditions': [ 3450 'conditions': [
3451 ['use_aura==1', { 3451 ['use_aura==1', {
3452 'dependencies': [ 3452 'dependencies': [
3453 '../build/linux/system.gyp:dbus', 3453 '../build/linux/system.gyp:dbus',
3454 '../build/linux/system.gyp:fontconfig', 3454 '../build/linux/system.gyp:fontconfig',
3455 '../build/linux/system.gyp:x11',
3456 '../dbus/dbus.gyp:dbus', 3455 '../dbus/dbus.gyp:dbus',
3457 ], 3456 ],
3458 'sources/': [ 3457 'sources/': [
3459 ['exclude', '^browser/platform_util_common_linux.cc'], 3458 ['exclude', '^browser/platform_util_common_linux.cc'],
3460 ], 3459 ],
3461 }], 3460 }],
3462 # GTK build only 3461 # GTK build only
3463 ['toolkit_uses_gtk==1', { 3462 ['toolkit_uses_gtk==1', {
3464 'sources/': [ 3463 'sources/': [
3465 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], 3464 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
3466 ], 3465 ],
3467 }], 3466 }],
3467 # x11 build
3468 ['use_x11==1', {
3469 'dependencies': [
3470 '../build/linux/system.gyp:x11',
3471 ],
3472 }],
3468 ], 3473 ],
3469 }], 3474 }],
3470 ['enable_plugin_installation==0', { 3475 ['enable_plugin_installation==0', {
3471 'sources!': [ 3476 'sources!': [
3472 'browser/plugins/plugin_installer.cc', 3477 'browser/plugins/plugin_installer.cc',
3473 'browser/plugins/plugin_installer.h', 3478 'browser/plugins/plugin_installer.h',
3474 'browser/plugins/plugin_installer_observer.cc', 3479 'browser/plugins/plugin_installer_observer.cc',
3475 'browser/plugins/plugin_installer_observer.h', 3480 'browser/plugins/plugin_installer_observer.h',
3476 'browser/plugins/plugins_resource_service.cc', 3481 'browser/plugins/plugins_resource_service.cc',
3477 'browser/plugins/plugins_resource_service.h', 3482 'browser/plugins/plugins_resource_service.h',
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
3742 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3747 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3743 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3748 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3744 }, 3749 },
3745 'includes': [ '../build/android/java_cpp_template.gypi' ], 3750 'includes': [ '../build/android/java_cpp_template.gypi' ],
3746 }, 3751 },
3747 ], 3752 ],
3748 }, 3753 },
3749 ], 3754 ],
3750 ], 3755 ],
3751 } 3756 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698