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

Side by Side Diff: chrome/chrome_browser_extensions.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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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_extensions', 8 'target_name': 'browser_extensions',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1029 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1030 '../third_party/libusb/libusb.gyp:libusb' 1030 '../third_party/libusb/libusb.gyp:libusb'
1031 ], 1031 ],
1032 }], 1032 }],
1033 ['use_aura==1', { 1033 ['use_aura==1', {
1034 'dependencies': [ 1034 'dependencies': [
1035 '../ui/keyboard/keyboard.gyp:keyboard', 1035 '../ui/keyboard/keyboard.gyp:keyboard',
1036 '../ui/keyboard/keyboard.gyp:keyboard_resources', 1036 '../ui/keyboard/keyboard.gyp:keyboard_resources',
1037 ], 1037 ],
1038 }], 1038 }],
1039 ['OS=="linux" and use_aura==1', { 1039 ['OS=="linux"', {
1040 'dependencies': [ 1040 'conditions': [
1041 '../build/linux/system.gyp:dbus', 1041 ['use_aura==1', {
1042 '../build/linux/system.gyp:fontconfig', 1042 'dependencies': [
1043 '../build/linux/system.gyp:x11', 1043 '../build/linux/system.gyp:dbus',
1044 '../dbus/dbus.gyp:dbus', 1044 '../build/linux/system.gyp:fontconfig',
1045 '../dbus/dbus.gyp:dbus',
1046 ],
1047 }],
1048 # x11 build
1049 ['use_x11==1', {
1050 'dependencies': [
1051 '../build/linux/system.gyp:x11',
1052 ],
1053 }],
1045 ], 1054 ],
1046 }], 1055 }],
1047 ['safe_browsing==1', { 1056 ['safe_browsing==1', {
1048 'defines': [ 1057 'defines': [
1049 'FULL_SAFE_BROWSING', 1058 'FULL_SAFE_BROWSING',
1050 ], 1059 ],
1051 }], 1060 }],
1052 ['safe_browsing==2', { 1061 ['safe_browsing==2', {
1053 'defines': [ 1062 'defines': [
1054 'MOBILE_SAFE_BROWSING', 1063 'MOBILE_SAFE_BROWSING',
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 'variables': { 1242 'variables': {
1234 'proto_in_dir': 'browser/chromeos/contacts', 1243 'proto_in_dir': 'browser/chromeos/contacts',
1235 'proto_out_dir': 'chrome/browser/chromeos/contacts', 1244 'proto_out_dir': 'chrome/browser/chromeos/contacts',
1236 }, 1245 },
1237 'includes': [ '../build/protoc.gypi' ] 1246 'includes': [ '../build/protoc.gypi' ]
1238 }, 1247 },
1239 ], 1248 ],
1240 },], # 'chromeos=1' 1249 },], # 'chromeos=1'
1241 ], # 'conditions' 1250 ], # 'conditions'
1242 } 1251 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_ui.gypi » ('j') | gpu/tools/tools.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698