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

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: 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 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1021 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1022 '../third_party/libusb/libusb.gyp:libusb' 1022 '../third_party/libusb/libusb.gyp:libusb'
1023 ], 1023 ],
1024 }], 1024 }],
1025 ['use_aura==1', { 1025 ['use_aura==1', {
1026 'dependencies': [ 1026 'dependencies': [
1027 '../ui/keyboard/keyboard.gyp:keyboard', 1027 '../ui/keyboard/keyboard.gyp:keyboard',
1028 '../ui/keyboard/keyboard.gyp:keyboard_resources', 1028 '../ui/keyboard/keyboard.gyp:keyboard_resources',
1029 ], 1029 ],
1030 }], 1030 }],
1031 ['OS=="linux" and use_aura==1', { 1031 ['OS=="linux"', {
1032 'dependencies': [ 1032 'conditions': [
1033 '../build/linux/system.gyp:dbus', 1033 ['use_aura==1', {
1034 '../build/linux/system.gyp:fontconfig', 1034 'dependencies': [
1035 '../build/linux/system.gyp:x11', 1035 '../build/linux/system.gyp:dbus',
1036 '../dbus/dbus.gyp:dbus', 1036 '../build/linux/system.gyp:fontconfig',
1037 '../dbus/dbus.gyp:dbus',
1038 ],
1039 }],
1040 # x11 build
1041 ['use_x11==1', {
1042 'dependencies': [
1043 '../build/linux/system.gyp:x11',
sky 2014/01/28 00:43:07 nit: indent.
kalyank 2014/01/28 01:18:47 Done.
1044 ],
1045 }],
1037 ], 1046 ],
1038 }], 1047 }],
1039 ['safe_browsing==1', { 1048 ['safe_browsing==1', {
1040 'defines': [ 1049 'defines': [
1041 'FULL_SAFE_BROWSING', 1050 'FULL_SAFE_BROWSING',
1042 ], 1051 ],
1043 }], 1052 }],
1044 ['safe_browsing==2', { 1053 ['safe_browsing==2', {
1045 'defines': [ 1054 'defines': [
1046 'MOBILE_SAFE_BROWSING', 1055 'MOBILE_SAFE_BROWSING',
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1230 'variables': { 1239 'variables': {
1231 'proto_in_dir': 'browser/chromeos/contacts', 1240 'proto_in_dir': 'browser/chromeos/contacts',
1232 'proto_out_dir': 'chrome/browser/chromeos/contacts', 1241 'proto_out_dir': 'chrome/browser/chromeos/contacts',
1233 }, 1242 },
1234 'includes': [ '../build/protoc.gypi' ] 1243 'includes': [ '../build/protoc.gypi' ]
1235 }, 1244 },
1236 ], 1245 ],
1237 },], # 'chromeos=1' 1246 },], # 'chromeos=1'
1238 ], # 'conditions' 1247 ], # 'conditions'
1239 } 1248 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698