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

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: nit: using display_name instead of device_name Created 4 years, 5 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
« no previous file with comments | « media/audio/cras/audio_manager_cras.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 'formats/mp2t/es_parser_test_base.h', 1350 'formats/mp2t/es_parser_test_base.h',
1351 'formats/mp2t/mp2t_stream_parser_unittest.cc', 1351 'formats/mp2t/mp2t_stream_parser_unittest.cc',
1352 'formats/mp2t/timestamp_unroller_unittest.cc', 1352 'formats/mp2t/timestamp_unroller_unittest.cc',
1353 ], 1353 ],
1354 }], 1354 }],
1355 ['use_x11==1', { 1355 ['use_x11==1', {
1356 'dependencies': [ 1356 'dependencies': [
1357 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1357 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1358 ], 1358 ],
1359 }], 1359 }],
1360 ['use_cras==1', {
1361 'dependencies': [
1362 '../chromeos/chromeos.gyp:chromeos',
1363 ],
1364 'cflags': [
1365 '<!@(<(pkg-config) --cflags libcras)',
1366 ],
1367 'link_settings': {
1368 'libraries': [
1369 '<!@(<(pkg-config) --libs libcras)',
1370 ],
1371 },
1372 'defines': [
1373 'USE_CRAS',
1374 ],
1375 }],
1360 ], 1376 ],
1361 }, 1377 },
1362 { 1378 {
1363 # GN version: //media:media_perftests 1379 # GN version: //media:media_perftests
1364 'target_name': 'media_perftests', 1380 'target_name': 'media_perftests',
1365 'type': '<(gtest_target_type)', 1381 'type': '<(gtest_target_type)',
1366 'dependencies': [ 1382 'dependencies': [
1367 '../base/base.gyp:test_support_base', 1383 '../base/base.gyp:test_support_base',
1368 '../testing/gmock.gyp:gmock', 1384 '../testing/gmock.gyp:gmock',
1369 '../testing/gtest.gyp:gtest', 1385 '../testing/gtest.gyp:gtest',
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
2283 'dependencies': [ 2299 'dependencies': [
2284 '../build/linux/system.gyp:libdrm', 2300 '../build/linux/system.gyp:libdrm',
2285 ] 2301 ]
2286 }], 2302 }],
2287 ], 2303 ],
2288 } 2304 }
2289 ] 2305 ]
2290 }], 2306 }],
2291 ], 2307 ],
2292 } 2308 }
OLDNEW
« no previous file with comments | « 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