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

Side by Side Diff: media/media.gyp

Issue 1727953005: Enable AudioDecoder unit tests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed contitions from base/container_names.* compilation Created 4 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/filters/audio_decoder_unittest.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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 }], 681 }],
682 ['media_use_ffmpeg==1', { 682 ['media_use_ffmpeg==1', {
683 'dependencies': [ 683 'dependencies': [
684 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 684 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
685 ], 685 ],
686 }, { # media_use_ffmpeg==0 686 }, { # media_use_ffmpeg==0
687 # Exclude the sources that depend on ffmpeg. 687 # Exclude the sources that depend on ffmpeg.
688 'sources!': [ 688 'sources!': [
689 'base/audio_video_metadata_extractor.cc', 689 'base/audio_video_metadata_extractor.cc',
690 'base/audio_video_metadata_extractor.h', 690 'base/audio_video_metadata_extractor.h',
691 'base/container_names.cc',
692 'base/container_names.h',
693 'base/media_file_checker.cc', 691 'base/media_file_checker.cc',
694 'base/media_file_checker.h', 692 'base/media_file_checker.h',
695 'ffmpeg/ffmpeg_common.cc', 693 'ffmpeg/ffmpeg_common.cc',
696 'ffmpeg/ffmpeg_common.h', 694 'ffmpeg/ffmpeg_common.h',
697 'filters/audio_file_reader.cc', 695 'filters/audio_file_reader.cc',
698 'filters/audio_file_reader.h', 696 'filters/audio_file_reader.h',
699 'filters/blocking_url_protocol.cc', 697 'filters/blocking_url_protocol.cc',
700 'filters/blocking_url_protocol.h', 698 'filters/blocking_url_protocol.h',
701 'filters/ffmpeg_aac_bitstream_converter.cc', 699 'filters/ffmpeg_aac_bitstream_converter.cc',
702 'filters/ffmpeg_aac_bitstream_converter.h', 700 'filters/ffmpeg_aac_bitstream_converter.h',
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 'sources!': [ 1390 'sources!': [
1393 'base/audio_video_metadata_extractor_unittest.cc', 1391 'base/audio_video_metadata_extractor_unittest.cc',
1394 'base/media_file_checker_unittest.cc', 1392 'base/media_file_checker_unittest.cc',
1395 'filters/ffmpeg_video_decoder_unittest.cc', 1393 'filters/ffmpeg_video_decoder_unittest.cc',
1396 'test/pipeline_integration_test.cc', 1394 'test/pipeline_integration_test.cc',
1397 'test/pipeline_integration_test_base.cc', 1395 'test/pipeline_integration_test_base.cc',
1398 1396
1399 # These tests are confused by Android always having proprietary 1397 # These tests are confused by Android always having proprietary
1400 # codecs enabled, but ffmpeg_branding=Chromium. These should be 1398 # codecs enabled, but ffmpeg_branding=Chromium. These should be
1401 # fixed, see http://crbug.com/570762. 1399 # fixed, see http://crbug.com/570762.
1402 'filters/audio_decoder_unittest.cc',
1403 'filters/audio_file_reader_unittest.cc', 1400 'filters/audio_file_reader_unittest.cc',
1404 'filters/ffmpeg_demuxer_unittest.cc', 1401 'filters/ffmpeg_demuxer_unittest.cc',
1405 ], 1402 ],
1406 }], 1403 }],
1407 ['OS=="android"', { 1404 ['OS=="android"', {
1408 'dependencies': [ 1405 'dependencies': [
1409 '../testing/android/native_test.gyp:native_test_native_code', 1406 '../testing/android/native_test.gyp:native_test_native_code',
1410 'player_android', 1407 'player_android',
1411 ], 1408 ],
1412 'sources!': [ 1409 'sources!': [
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 'dependencies': [ 2176 'dependencies': [
2180 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2177 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2181 ], 2178 ],
2182 }], 2179 }],
2183 ], 2180 ],
2184 }, 2181 },
2185 ], 2182 ],
2186 }], 2183 }],
2187 ], 2184 ],
2188 } 2185 }
OLDNEW
« no previous file with comments | « media/filters/audio_decoder_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698