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

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: 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 | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_ui.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 (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 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1031 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1032 '../third_party/libusb/libusb.gyp:libusb' 1032 '../third_party/libusb/libusb.gyp:libusb'
1033 ], 1033 ],
1034 }], 1034 }],
1035 ['use_aura==1', { 1035 ['use_aura==1', {
1036 'dependencies': [ 1036 'dependencies': [
1037 '../ui/keyboard/keyboard.gyp:keyboard', 1037 '../ui/keyboard/keyboard.gyp:keyboard',
1038 '../ui/keyboard/keyboard.gyp:keyboard_resources', 1038 '../ui/keyboard/keyboard.gyp:keyboard_resources',
1039 ], 1039 ],
1040 }], 1040 }],
1041 ['OS=="linux" and use_aura==1', { 1041 ['OS=="linux"', {
1042 'dependencies': [ 1042 'conditions': [
1043 '../build/linux/system.gyp:dbus', 1043 ['use_aura==1', {
1044 '../build/linux/system.gyp:fontconfig', 1044 'dependencies': [
1045 '../build/linux/system.gyp:x11', 1045 '../build/linux/system.gyp:dbus',
1046 '../dbus/dbus.gyp:dbus', 1046 '../build/linux/system.gyp:fontconfig',
1047 '../dbus/dbus.gyp:dbus',
1048 ],
1049 }],
1050 # x11 build
1051 ['use_x11==1', {
1052 'dependencies': [
1053 '../build/linux/system.gyp:x11',
1054 ],
1055 }],
1047 ], 1056 ],
1048 }], 1057 }],
1049 ['safe_browsing==1', { 1058 ['safe_browsing==1', {
1050 'defines': [ 1059 'defines': [
1051 'FULL_SAFE_BROWSING', 1060 'FULL_SAFE_BROWSING',
1052 ], 1061 ],
1053 }], 1062 }],
1054 ['safe_browsing==2', { 1063 ['safe_browsing==2', {
1055 'defines': [ 1064 'defines': [
1056 'MOBILE_SAFE_BROWSING', 1065 'MOBILE_SAFE_BROWSING',
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 'variables': { 1244 'variables': {
1236 'proto_in_dir': 'browser/chromeos/contacts', 1245 'proto_in_dir': 'browser/chromeos/contacts',
1237 'proto_out_dir': 'chrome/browser/chromeos/contacts', 1246 'proto_out_dir': 'chrome/browser/chromeos/contacts',
1238 }, 1247 },
1239 'includes': [ '../build/protoc.gypi' ] 1248 'includes': [ '../build/protoc.gypi' ]
1240 }, 1249 },
1241 ], 1250 ],
1242 },], # 'chromeos=1' 1251 },], # 'chromeos=1'
1243 ], # 'conditions' 1252 ], # 'conditions'
1244 } 1253 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698