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

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: Added media.gyp changes 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
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 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 'cdm/external_clear_key_test_helper.h', 1297 'cdm/external_clear_key_test_helper.h',
1298 'cdm/json_web_key_unittest.cc', 1298 'cdm/json_web_key_unittest.cc',
1299 'cdm/simple_cdm_allocator.cc', 1299 'cdm/simple_cdm_allocator.cc',
1300 'cdm/simple_cdm_allocator.h', 1300 'cdm/simple_cdm_allocator.h',
1301 'cdm/simple_cdm_allocator_unittest.cc', 1301 'cdm/simple_cdm_allocator_unittest.cc',
1302 'cdm/simple_cdm_buffer.cc', 1302 'cdm/simple_cdm_buffer.cc',
1303 'cdm/simple_cdm_buffer.h', 1303 'cdm/simple_cdm_buffer.h',
1304 'ffmpeg/ffmpeg_common_unittest.cc', 1304 'ffmpeg/ffmpeg_common_unittest.cc',
1305 'filters/audio_clock_unittest.cc', 1305 'filters/audio_clock_unittest.cc',
1306 'filters/audio_decoder_selector_unittest.cc', 1306 'filters/audio_decoder_selector_unittest.cc',
1307 'filters/audio_decoder_test.h',
1307 'filters/audio_decoder_unittest.cc', 1308 'filters/audio_decoder_unittest.cc',
1309 'filters/audio_decoder_unittest_chromium.cc',
1310 'filters/audio_decoder_unittest_ffmpeg.cc',
1308 'filters/audio_file_reader_unittest.cc', 1311 'filters/audio_file_reader_unittest.cc',
1309 'filters/audio_renderer_algorithm_unittest.cc', 1312 'filters/audio_renderer_algorithm_unittest.cc',
1310 'filters/blocking_url_protocol_unittest.cc', 1313 'filters/blocking_url_protocol_unittest.cc',
1311 'filters/chunk_demuxer_unittest.cc', 1314 'filters/chunk_demuxer_unittest.cc',
1312 'filters/decrypting_audio_decoder_unittest.cc', 1315 'filters/decrypting_audio_decoder_unittest.cc',
1313 'filters/decrypting_demuxer_stream_unittest.cc', 1316 'filters/decrypting_demuxer_stream_unittest.cc',
1314 'filters/decrypting_video_decoder_unittest.cc', 1317 'filters/decrypting_video_decoder_unittest.cc',
1315 'filters/fake_video_decoder.cc', 1318 'filters/fake_video_decoder.cc',
1316 'filters/fake_video_decoder.h', 1319 'filters/fake_video_decoder.h',
1317 'filters/fake_video_decoder_unittest.cc', 1320 'filters/fake_video_decoder_unittest.cc',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1371 'filters/h265_parser_unittest.cc', 1374 'filters/h265_parser_unittest.cc',
1372 ], 1375 ],
1373 }], 1376 }],
1374 ['media_use_ffmpeg==1', { 1377 ['media_use_ffmpeg==1', {
1375 'dependencies': [ 1378 'dependencies': [
1376 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1379 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1377 ], 1380 ],
1378 }, { # media_use_ffmpeg==0 1381 }, { # media_use_ffmpeg==0
1379 'sources!': [ 1382 'sources!': [
1380 'ffmpeg/ffmpeg_common_unittest.cc', 1383 'ffmpeg/ffmpeg_common_unittest.cc',
1381 'filters/audio_decoder_unittest.cc', 1384 'filters/audio_decoder_unittest_ffmpeg.cc',
1382 'filters/ffmpeg_aac_bitstream_converter_unittest.cc', 1385 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1383 'filters/ffmpeg_demuxer_unittest.cc', 1386 'filters/ffmpeg_demuxer_unittest.cc',
1384 'filters/ffmpeg_glue_unittest.cc', 1387 'filters/ffmpeg_glue_unittest.cc',
1385 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1388 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1386 ], 1389 ],
1387 }], 1390 }],
1388 # Even if FFmpeg is enabled on Android we don't want these. 1391 # Even if FFmpeg is enabled on Android we don't want these.
1389 # TODO(watk): Refactor tests that could be made to run on Android. See 1392 # TODO(watk): Refactor tests that could be made to run on Android. See
1390 # http://crbug.com/570762 1393 # http://crbug.com/570762
1391 ['media_use_ffmpeg==0 or OS=="android"', { 1394 ['media_use_ffmpeg==0 or OS=="android"', {
1392 'sources!': [ 1395 'sources!': [
1393 'base/audio_video_metadata_extractor_unittest.cc', 1396 'base/audio_video_metadata_extractor_unittest.cc',
1394 'base/media_file_checker_unittest.cc', 1397 'base/media_file_checker_unittest.cc',
1395 'filters/ffmpeg_video_decoder_unittest.cc', 1398 'filters/ffmpeg_video_decoder_unittest.cc',
1396 'test/pipeline_integration_test.cc', 1399 'test/pipeline_integration_test.cc',
1397 'test/pipeline_integration_test_base.cc', 1400 'test/pipeline_integration_test_base.cc',
1398 1401
1399 # These tests are confused by Android always having proprietary 1402 # These tests are confused by Android always having proprietary
1400 # codecs enabled, but ffmpeg_branding=Chromium. These should be 1403 # codecs enabled, but ffmpeg_branding=Chromium. These should be
1401 # fixed, see http://crbug.com/570762. 1404 # fixed, see http://crbug.com/570762.
1402 'filters/audio_decoder_unittest.cc', 1405 'filters/audio_decoder_unittest_ffmpeg.cc',
1403 'filters/audio_file_reader_unittest.cc', 1406 'filters/audio_file_reader_unittest.cc',
1404 'filters/ffmpeg_demuxer_unittest.cc', 1407 'filters/ffmpeg_demuxer_unittest.cc',
1405 ], 1408 ],
1406 }], 1409 }],
1407 ['OS=="android"', { 1410 ['OS=="android"', {
1408 'dependencies': [ 1411 'dependencies': [
1409 '../testing/android/native_test.gyp:native_test_native_code', 1412 '../testing/android/native_test.gyp:native_test_native_code',
1410 'player_android', 1413 'player_android',
1411 ], 1414 ],
1412 'sources!': [ 1415 'sources!': [
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 'dependencies': [ 2182 'dependencies': [
2180 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2183 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2181 ], 2184 ],
2182 }], 2185 }],
2183 ], 2186 ],
2184 }, 2187 },
2185 ], 2188 ],
2186 }], 2189 }],
2187 ], 2190 ],
2188 } 2191 }
OLDNEW
« media/BUILD.gn ('K') | « media/filters/audio_decoder_unittest_ffmpeg.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698