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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 # Override to dynamically link the cras (ChromeOS audio) library. | 8 # Override to dynamically link the cras (ChromeOS audio) library. |
| 9 'use_cras%': 0, | 9 'use_cras%': 0, |
| 10 # Option e.g. for Linux distributions to link pulseaudio directly | 10 # Option e.g. for Linux distributions to link pulseaudio directly |
| (...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1409 # http://crbug.com/171009 | 1409 # http://crbug.com/171009 |
| 1410 ['OS=="win" and target_arch=="x64"', { | 1410 ['OS=="win" and target_arch=="x64"', { |
| 1411 'msvs_disabled_warnings': [ 4267, ], | 1411 'msvs_disabled_warnings': [ 4267, ], |
| 1412 }], | 1412 }], |
| 1413 ['OS=="mac"', { | 1413 ['OS=="mac"', { |
| 1414 'sources': [ | 1414 'sources': [ |
| 1415 'midi/midi_manager_mac_unittest.cc', | 1415 'midi/midi_manager_mac_unittest.cc', |
| 1416 'video/capture/mac/video_capture_device_factory_mac_unittest.mm', | 1416 'video/capture/mac/video_capture_device_factory_mac_unittest.mm', |
| 1417 ] | 1417 ] |
| 1418 }], | 1418 }], |
| 1419 ['use_alsa==1', { | 1419 ['use_alsa==1', { |
|
M-A Ruel
2015/03/26 19:44:11
do you mind fixing alignment for this line while a
llandwerlin-old
2015/03/26 22:28:47
What's wrong with this particular line?
| |
| 1420 'sources': [ | 1420 'sources': [ |
| 1421 'midi/midi_manager_alsa_unittest.cc', | 1421 'midi/midi_manager_alsa_unittest.cc', |
| 1422 ] | 1422 ] |
| 1423 }], | 1423 }], |
| 1424 ['use_x11==1', | |
|
M-A Ruel
2015/03/26 19:44:11
If you look around, format is:
['use_x11==1', {
llandwerlin-old
2015/03/26 22:28:47
Done.
| |
| 1425 { | |
| 1426 'dependencies': [ | |
| 1427 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | |
| 1428 ], | |
| 1429 } | |
|
M-A Ruel
2015/03/26 19:44:11
}],
is the idiomatic format.
llandwerlin-old
2015/03/26 22:28:47
Done.
| |
| 1430 ], | |
| 1424 ], | 1431 ], |
| 1425 }, | 1432 }, |
| 1426 { | 1433 { |
| 1427 # GN version: //media:media_perftests | 1434 # GN version: //media:media_perftests |
| 1428 'target_name': 'media_perftests', | 1435 'target_name': 'media_perftests', |
| 1429 'type': '<(gtest_target_type)', | 1436 'type': '<(gtest_target_type)', |
| 1430 'dependencies': [ | 1437 'dependencies': [ |
| 1431 '../base/base.gyp:test_support_base', | 1438 '../base/base.gyp:test_support_base', |
| 1432 '../testing/gmock.gyp:gmock', | 1439 '../testing/gmock.gyp:gmock', |
| 1433 '../testing/gtest.gyp:gtest', | 1440 '../testing/gtest.gyp:gtest', |
| (...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1966 '../build/isolate.gypi', | 1973 '../build/isolate.gypi', |
| 1967 ], | 1974 ], |
| 1968 'sources': [ | 1975 'sources': [ |
| 1969 'media_unittests.isolate', | 1976 'media_unittests.isolate', |
| 1970 ], | 1977 ], |
| 1971 }, | 1978 }, |
| 1972 ], | 1979 ], |
| 1973 }], | 1980 }], |
| 1974 ], | 1981 ], |
| 1975 } | 1982 } |
| OLD | NEW |