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

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: Fix embarrassing mistake that broke driver and manufacturer 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
« no previous file with comments | « media/DEPS ('k') | media/midi/midi_manager_alsa.h » ('j') | 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 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 'sources': [ 1080 'sources': [
1081 'filters/source_buffer_platform.h', 1081 'filters/source_buffer_platform.h',
1082 'filters/source_buffer_platform_lowmem.cc', 1082 'filters/source_buffer_platform_lowmem.cc',
1083 ] 1083 ]
1084 }, { # 'use_low_memory_buffer==0' 1084 }, { # 'use_low_memory_buffer==0'
1085 'sources': [ 1085 'sources': [
1086 'filters/source_buffer_platform.cc', 1086 'filters/source_buffer_platform.cc',
1087 'filters/source_buffer_platform.h', 1087 'filters/source_buffer_platform.h',
1088 ] 1088 ]
1089 }], 1089 }],
1090 ['use_udev==1', {
1091 'dependencies': [
1092 '../device/udev_linux/udev.gyp:udev_linux',
1093 ],
1094 }],
1090 ], # conditions 1095 ], # conditions
1091 'target_conditions': [ 1096 'target_conditions': [
1092 ['OS == "ios" and _toolset != "host"', { 1097 ['OS == "ios" and _toolset != "host"', {
1093 'sources/': [ 1098 'sources/': [
1094 # Pull in specific Mac files for iOS (which have been filtered out 1099 # Pull in specific Mac files for iOS (which have been filtered out
1095 # by file name rules). 1100 # by file name rules).
1096 ['include', '^base/mac/coremedia_glue\\.h$'], 1101 ['include', '^base/mac/coremedia_glue\\.h$'],
1097 ['include', '^base/mac/coremedia_glue\\.mm$'], 1102 ['include', '^base/mac/coremedia_glue\\.mm$'],
1098 ['include', '^base/mac/corevideo_glue\\.h$'], 1103 ['include', '^base/mac/corevideo_glue\\.h$'],
1099 ['include', '^base/mac/videotoolbox_glue\\.h$'], 1104 ['include', '^base/mac/videotoolbox_glue\\.h$'],
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1394 # http://crbug.com/171009 1399 # http://crbug.com/171009
1395 ['OS=="win" and target_arch=="x64"', { 1400 ['OS=="win" and target_arch=="x64"', {
1396 'msvs_disabled_warnings': [ 4267, ], 1401 'msvs_disabled_warnings': [ 4267, ],
1397 }], 1402 }],
1398 ['OS=="mac"', { 1403 ['OS=="mac"', {
1399 'sources': [ 1404 'sources': [
1400 'midi/midi_manager_mac_unittest.cc', 1405 'midi/midi_manager_mac_unittest.cc',
1401 'video/capture/mac/video_capture_device_factory_mac_unittest.mm', 1406 'video/capture/mac/video_capture_device_factory_mac_unittest.mm',
1402 ] 1407 ]
1403 }], 1408 }],
1409 ['use_alsa==1', {
1410 'sources': [
1411 'midi/midi_manager_alsa_unittest.cc',
1412 ]
1413 }],
1404 ], 1414 ],
1405 }, 1415 },
1406 { 1416 {
1407 # GN version: //media:media_perftests 1417 # GN version: //media:media_perftests
1408 'target_name': 'media_perftests', 1418 'target_name': 'media_perftests',
1409 'type': '<(gtest_target_type)', 1419 'type': '<(gtest_target_type)',
1410 'dependencies': [ 1420 'dependencies': [
1411 '../base/base.gyp:test_support_base', 1421 '../base/base.gyp:test_support_base',
1412 '../testing/gmock.gyp:gmock', 1422 '../testing/gmock.gyp:gmock',
1413 '../testing/gtest.gyp:gtest', 1423 '../testing/gtest.gyp:gtest',
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1936 '../build/isolate.gypi', 1946 '../build/isolate.gypi',
1937 ], 1947 ],
1938 'sources': [ 1948 'sources': [
1939 'media_unittests.isolate', 1949 'media_unittests.isolate',
1940 ], 1950 ],
1941 }, 1951 },
1942 ], 1952 ],
1943 }], 1953 }],
1944 ], 1954 ],
1945 } 1955 }
OLDNEW
« no previous file with comments | « media/DEPS ('k') | media/midi/midi_manager_alsa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698