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

Side by Side Diff: content/content_browser.gypi

Issue 12374068: Make it possible to disable udev in linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review fixups Created 7 years, 1 month 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'dependencies': [ 6 'dependencies': [
7 'browser/speech/proto/speech_proto.gyp:speech_proto', 7 'browser/speech/proto/speech_proto.gyp:speech_proto',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../google_apis/google_apis.gyp:google_apis', 10 '../google_apis/google_apis.gyp:google_apis',
(...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 # For FcLangSetAdd call in render_sandbox_host_linux.cc 1390 # For FcLangSetAdd call in render_sandbox_host_linux.cc
1391 '../build/linux/system.gyp:fontconfig', 1391 '../build/linux/system.gyp:fontconfig',
1392 '../build/linux/system.gyp:gtk', 1392 '../build/linux/system.gyp:gtk',
1393 # For XShm* in backing_store_x.cc 1393 # For XShm* in backing_store_x.cc
1394 '../build/linux/system.gyp:x11', 1394 '../build/linux/system.gyp:x11',
1395 '../dbus/dbus.gyp:dbus', 1395 '../dbus/dbus.gyp:dbus',
1396 ], 1396 ],
1397 }], 1397 }],
1398 ['OS=="linux"', { 1398 ['OS=="linux"', {
1399 'dependencies': [ 1399 'dependencies': [
1400 '../sandbox/sandbox.gyp:libc_urandom_override',
1401 ],
1402 }],
1403 ['use_udev == 1', {
1404 'dependencies': [
1400 '../build/linux/system.gyp:udev', 1405 '../build/linux/system.gyp:udev',
1401 '../sandbox/sandbox.gyp:libc_urandom_override', 1406 ],
1407 'defines': [
1408 'USE_UDEV',
jam 2013/11/14 17:37:29 nit: the convention is that this is done in build\
Mostyn Bramley-Moore 2013/11/14 19:58:22 Done. (Though this has the small downside of inva
1409 ],
1410 }, {
1411 'sources!': [
1412 'browser/device_monitor_linux.cc',
1413 'browser/device_monitor_linux.h',
1414 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
1415 'browser/udev_linux.cc',
1416 'browser/udev_linux.h',
1417 ],
1418 'sources': [
1419 'browser/gamepad/gamepad_platform_data_fetcher.cc',
jam 2013/11/14 17:37:29 can you just update the condition on line 1245 to
Mostyn Bramley-Moore 2013/11/14 19:58:22 Done.
1402 ], 1420 ],
1403 }], 1421 }],
1404 ['OS=="linux" and use_aura==1', { 1422 ['OS=="linux" and use_aura==1', {
1405 'dependencies': [ 1423 'dependencies': [
1406 '../build/linux/system.gyp:dbus', 1424 '../build/linux/system.gyp:dbus',
1407 '../build/linux/system.gyp:fontconfig', 1425 '../build/linux/system.gyp:fontconfig',
1408 '../dbus/dbus.gyp:dbus', 1426 '../dbus/dbus.gyp:dbus',
1409 ], 1427 ],
1410 }], 1428 }],
1411 ['use_x11==1', { 1429 ['use_x11==1', {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ], 1591 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ],
1574 ], 1592 ],
1575 }, { # input_speech==1 1593 }, { # input_speech==1
1576 'dependencies': [ 1594 'dependencies': [
1577 '../third_party/flac/flac.gyp:libflac', 1595 '../third_party/flac/flac.gyp:libflac',
1578 '../third_party/speex/speex.gyp:libspeex', 1596 '../third_party/speex/speex.gyp:libspeex',
1579 ], 1597 ],
1580 }], 1598 }],
1581 ], 1599 ],
1582 } 1600 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698