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

Side by Side Diff: media/media.gyp

Issue 2079843003: Allow AudioManagerCras enumerate audio devices from CRAS not just defaults (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporate tommi's comment Created 4 years, 6 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) 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 1385 matching lines...) Expand 10 before | Expand all | Expand 10 after
1396 'formats/mp2t/es_parser_test_base.h', 1396 'formats/mp2t/es_parser_test_base.h',
1397 'formats/mp2t/mp2t_stream_parser_unittest.cc', 1397 'formats/mp2t/mp2t_stream_parser_unittest.cc',
1398 'formats/mp2t/timestamp_unroller_unittest.cc', 1398 'formats/mp2t/timestamp_unroller_unittest.cc',
1399 ], 1399 ],
1400 }], 1400 }],
1401 ['use_x11==1', { 1401 ['use_x11==1', {
1402 'dependencies': [ 1402 'dependencies': [
1403 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1403 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1404 ], 1404 ],
1405 }], 1405 }],
1406 ['use_cras==1', {
1407 'dependencies': [
1408 '../chromeos/chromeos.gyp:chromeos',
1409 ],
1410 'cflags': [
1411 '<!@(<(pkg-config) --cflags libcras)',
1412 ],
1413 'link_settings': {
1414 'libraries': [
1415 '<!@(<(pkg-config) --libs libcras)',
1416 ],
1417 },
1418 'defines': [
1419 'USE_CRAS',
1420 ],
1421 }],
1406 ], 1422 ],
1407 }, 1423 },
1408 { 1424 {
1409 # GN version: //media:media_perftests 1425 # GN version: //media:media_perftests
1410 'target_name': 'media_perftests', 1426 'target_name': 'media_perftests',
1411 'type': '<(gtest_target_type)', 1427 'type': '<(gtest_target_type)',
1412 'dependencies': [ 1428 'dependencies': [
1413 '../base/base.gyp:test_support_base', 1429 '../base/base.gyp:test_support_base',
1414 '../testing/gmock.gyp:gmock', 1430 '../testing/gmock.gyp:gmock',
1415 '../testing/gtest.gyp:gtest', 1431 '../testing/gtest.gyp:gtest',
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
2318 'dependencies': [ 2334 'dependencies': [
2319 '../build/linux/system.gyp:libdrm', 2335 '../build/linux/system.gyp:libdrm',
2320 ] 2336 ]
2321 }], 2337 }],
2322 ], 2338 ],
2323 } 2339 }
2324 ] 2340 ]
2325 }], 2341 }],
2326 ], 2342 ],
2327 } 2343 }
OLDNEW
« media/audio/cras/audio_manager_cras.cc ('K') | « media/audio/cras/audio_manager_cras.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698