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

Side by Side Diff: media/media.gyp

Issue 1447943002: Revert of Add unit tests for CdmAdapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/cdm/ppapi/external_clear_key/clear_key_cdm.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 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 ['OS=="android"', { 1386 ['OS=="android"', {
1387 'dependencies': [ 1387 'dependencies': [
1388 '../testing/android/native_test.gyp:native_test_native_code', 1388 '../testing/android/native_test.gyp:native_test_native_code',
1389 'player_android', 1389 'player_android',
1390 ], 1390 ],
1391 'sources!': [ 1391 'sources!': [
1392 'filters/decrypting_audio_decoder_unittest.cc', 1392 'filters/decrypting_audio_decoder_unittest.cc',
1393 'filters/decrypting_video_decoder_unittest.cc', 1393 'filters/decrypting_video_decoder_unittest.cc',
1394 ], 1394 ],
1395 }], 1395 }],
1396 # If ExternalClearKey is built, we can test CdmAdapter.
1397 ['enable_pepper_cdms == 1', {
1398 'dependencies': [
1399 'clearkeycdm',
1400 ],
1401 'sources': [
1402 'cdm/cdm_adapter_unittest.cc',
1403 ],
1404 }],
1405 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 1396 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
1406 'sources': [ 1397 'sources': [
1407 'filters/h264_bitstream_buffer_unittest.cc', 1398 'filters/h264_bitstream_buffer_unittest.cc',
1408 ], 1399 ],
1409 }], 1400 }],
1410 ['target_arch=="ia32" or target_arch=="x64"', { 1401 ['target_arch=="ia32" or target_arch=="x64"', {
1411 'sources': [ 1402 'sources': [
1412 'base/simd/convert_rgb_to_yuv_unittest.cc', 1403 'base/simd/convert_rgb_to_yuv_unittest.cc',
1413 ], 1404 ],
1414 }], 1405 }],
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 'dependencies': [ 2117 'dependencies': [
2127 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2118 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2128 ], 2119 ],
2129 }], 2120 }],
2130 ], 2121 ],
2131 }, 2122 },
2132 ], 2123 ],
2133 }], 2124 }],
2134 ], 2125 ],
2135 } 2126 }
OLDNEW
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698