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

Side by Side Diff: media/media.gyp

Issue 968663004: Improve MidiManagerAlsa manufacturer reporting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@udev
Patch Set: Undo incorrect use of MEDIA_IMPLEMENTATION Created 5 years, 9 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 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 'sources': [ 1078 'sources': [
1079 'filters/source_buffer_platform.h', 1079 'filters/source_buffer_platform.h',
1080 'filters/source_buffer_platform_lowmem.cc', 1080 'filters/source_buffer_platform_lowmem.cc',
1081 ] 1081 ]
1082 }, { # 'use_low_memory_buffer==0' 1082 }, { # 'use_low_memory_buffer==0'
1083 'sources': [ 1083 'sources': [
1084 'filters/source_buffer_platform.cc', 1084 'filters/source_buffer_platform.cc',
1085 'filters/source_buffer_platform.h', 1085 'filters/source_buffer_platform.h',
1086 ] 1086 ]
1087 }], 1087 }],
1088 ['use_udev==1', {
1089 'dependencies': [
1090 '../device/udev_linux/udev.gyp:udev_linux',
1091 ],
1092 }],
1088 ], # conditions 1093 ], # conditions
1089 'target_conditions': [ 1094 'target_conditions': [
1090 ['OS == "ios" and _toolset != "host"', { 1095 ['OS == "ios" and _toolset != "host"', {
1091 'sources/': [ 1096 'sources/': [
1092 # Pull in specific Mac files for iOS (which have been filtered out 1097 # Pull in specific Mac files for iOS (which have been filtered out
1093 # by file name rules). 1098 # by file name rules).
1094 ['include', '^base/mac/coremedia_glue\\.h$'], 1099 ['include', '^base/mac/coremedia_glue\\.h$'],
1095 ['include', '^base/mac/coremedia_glue\\.mm$'], 1100 ['include', '^base/mac/coremedia_glue\\.mm$'],
1096 ['include', '^base/mac/corevideo_glue\\.h$'], 1101 ['include', '^base/mac/corevideo_glue\\.h$'],
1097 ['include', '^base/mac/videotoolbox_glue\\.h$'], 1102 ['include', '^base/mac/videotoolbox_glue\\.h$'],
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 # http://crbug.com/171009 1397 # http://crbug.com/171009
1393 ['OS=="win" and target_arch=="x64"', { 1398 ['OS=="win" and target_arch=="x64"', {
1394 'msvs_disabled_warnings': [ 4267, ], 1399 'msvs_disabled_warnings': [ 4267, ],
1395 }], 1400 }],
1396 ['OS=="mac"', { 1401 ['OS=="mac"', {
1397 'sources': [ 1402 'sources': [
1398 'midi/midi_manager_mac_unittest.cc', 1403 'midi/midi_manager_mac_unittest.cc',
1399 'video/capture/mac/video_capture_device_factory_mac_unittest.mm', 1404 'video/capture/mac/video_capture_device_factory_mac_unittest.mm',
1400 ] 1405 ]
1401 }], 1406 }],
1407 ['OS=="linux"', {
wolenetz 2015/03/04 19:28:58 Why is this divergent from media.gn's use_alsa, an
Adam Goode 2015/03/04 19:59:18 Good catch.
1408 'sources': [
1409 'midi/midi_manager_alsa_unittest.cc',
1410 ]
1411 }],
1402 ], 1412 ],
1403 }, 1413 },
1404 { 1414 {
1405 # GN version: //media:media_perftests 1415 # GN version: //media:media_perftests
1406 'target_name': 'media_perftests', 1416 'target_name': 'media_perftests',
1407 'type': '<(gtest_target_type)', 1417 'type': '<(gtest_target_type)',
1408 'dependencies': [ 1418 'dependencies': [
1409 '../base/base.gyp:test_support_base', 1419 '../base/base.gyp:test_support_base',
1410 '../testing/gmock.gyp:gmock', 1420 '../testing/gmock.gyp:gmock',
1411 '../testing/gtest.gyp:gtest', 1421 '../testing/gtest.gyp:gtest',
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 '../build/isolate.gypi', 1942 '../build/isolate.gypi',
1933 ], 1943 ],
1934 'sources': [ 1944 'sources': [
1935 'media_unittests.isolate', 1945 'media_unittests.isolate',
1936 ], 1946 ],
1937 }, 1947 },
1938 ], 1948 ],
1939 }], 1949 }],
1940 ], 1950 ],
1941 } 1951 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698