Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 '../build/linux/system.gyp:udev', | 1400 '../build/linux/system.gyp:udev', |
| 1401 '../sandbox/sandbox.gyp:libc_urandom_override', | 1401 '../sandbox/sandbox.gyp:libc_urandom_override', |
| 1402 ], | 1402 ], |
| 1403 }], | 1403 }], |
| 1404 ['use_udev == 1', { | |
| 1405 'defines': [ | |
| 1406 'USE_UDEV', | |
| 1407 ], | |
| 1408 }, { | |
| 1409 'sources!': [ | |
| 1410 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', | |
| 1411 'browser/udev_linux.cc', | |
| 1412 'browser/udev_linux.h', | |
| 1413 'browser/device_monitor_linux.cc', | |
|
Lei Zhang
2013/11/14 00:35:00
nit: alphabetical order
Mostyn Bramley-Moore
2013/11/14 01:15:38
Done.
| |
| 1414 'browser/device_monitor_linux.h', | |
| 1415 ], | |
| 1416 'sources': [ | |
| 1417 'browser/gamepad/gamepad_platform_data_fetcher.cc', | |
| 1418 ], | |
| 1419 'dependencies!': [ | |
| 1420 '../build/linux/system.gyp:udev', | |
|
Lei Zhang
2013/11/14 00:35:00
Can you remove this, and instead move line 1400 in
Mostyn Bramley-Moore
2013/11/14 01:15:38
Done.
| |
| 1421 ], | |
| 1422 }], | |
| 1404 ['OS=="linux" and use_aura==1', { | 1423 ['OS=="linux" and use_aura==1', { |
| 1405 'dependencies': [ | 1424 'dependencies': [ |
| 1406 '../build/linux/system.gyp:dbus', | 1425 '../build/linux/system.gyp:dbus', |
| 1407 '../build/linux/system.gyp:fontconfig', | 1426 '../build/linux/system.gyp:fontconfig', |
| 1408 '../dbus/dbus.gyp:dbus', | 1427 '../dbus/dbus.gyp:dbus', |
| 1409 ], | 1428 ], |
| 1410 }], | 1429 }], |
| 1411 ['use_x11==1', { | 1430 ['use_x11==1', { |
| 1412 'dependencies': [ | 1431 'dependencies': [ |
| 1413 '../build/linux/system.gyp:x11', | 1432 '../build/linux/system.gyp:x11', |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1573 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ], | 1592 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ], |
| 1574 ], | 1593 ], |
| 1575 }, { # input_speech==1 | 1594 }, { # input_speech==1 |
| 1576 'dependencies': [ | 1595 'dependencies': [ |
| 1577 '../third_party/flac/flac.gyp:libflac', | 1596 '../third_party/flac/flac.gyp:libflac', |
| 1578 '../third_party/speex/speex.gyp:libspeex', | 1597 '../third_party/speex/speex.gyp:libspeex', |
| 1579 ], | 1598 ], |
| 1580 }], | 1599 }], |
| 1581 ], | 1600 ], |
| 1582 } | 1601 } |
| OLD | NEW |