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

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: Include compositor_model_bench for only x11 builds for now. (Right Version) 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 3436 matching lines...) Expand 10 before | Expand all | Expand 10 after
3447 ], 3447 ],
3448 }], 3448 }],
3449 ], 3449 ],
3450 }], 3450 }],
3451 ['OS=="linux"', { 3451 ['OS=="linux"', {
3452 'conditions': [ 3452 'conditions': [
3453 ['use_aura==1', { 3453 ['use_aura==1', {
3454 'dependencies': [ 3454 'dependencies': [
3455 '../build/linux/system.gyp:dbus', 3455 '../build/linux/system.gyp:dbus',
3456 '../build/linux/system.gyp:fontconfig', 3456 '../build/linux/system.gyp:fontconfig',
3457 '../build/linux/system.gyp:x11',
3458 '../dbus/dbus.gyp:dbus', 3457 '../dbus/dbus.gyp:dbus',
3459 ], 3458 ],
3460 'sources/': [ 3459 'sources/': [
3461 ['exclude', '^browser/platform_util_common_linux.cc'], 3460 ['exclude', '^browser/platform_util_common_linux.cc'],
3462 ], 3461 ],
3463 }], 3462 }],
3464 # GTK build only 3463 # GTK build only
3465 ['toolkit_uses_gtk==1', { 3464 ['toolkit_uses_gtk==1', {
3466 'sources/': [ 3465 'sources/': [
3467 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], 3466 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
3468 ], 3467 ],
3469 }], 3468 }],
3469 # x11 build
3470 ['use_x11==1', {
3471 'dependencies': [
3472 '../build/linux/system.gyp:x11',
3473 ],
3474 }],
3470 ], 3475 ],
3471 }], 3476 }],
3472 ['enable_plugin_installation==0', { 3477 ['enable_plugin_installation==0', {
3473 'sources!': [ 3478 'sources!': [
3474 'browser/plugins/plugin_installer.cc', 3479 'browser/plugins/plugin_installer.cc',
3475 'browser/plugins/plugin_installer.h', 3480 'browser/plugins/plugin_installer.h',
3476 'browser/plugins/plugin_installer_observer.cc', 3481 'browser/plugins/plugin_installer_observer.cc',
3477 'browser/plugins/plugin_installer_observer.h', 3482 'browser/plugins/plugin_installer_observer.h',
3478 'browser/plugins/plugins_resource_service.cc', 3483 'browser/plugins/plugins_resource_service.cc',
3479 'browser/plugins/plugins_resource_service.h', 3484 'browser/plugins/plugins_resource_service.h',
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
3744 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3749 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3745 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3750 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3746 }, 3751 },
3747 'includes': [ '../build/android/java_cpp_template.gypi' ], 3752 'includes': [ '../build/android/java_cpp_template.gypi' ],
3748 }, 3753 },
3749 ], 3754 ],
3750 }, 3755 },
3751 ], 3756 ],
3752 ], 3757 ],
3753 } 3758 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698