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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 1428753010: Add unit tests for CdmAdapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes for bots 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 side-by-side diff with in-line comments
Download patch
« media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('K') | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 2ca6e55027cd54b575ddcc441360342663711f68..a963d915f8c9196ae5f32d3c903e4eb8361a63a3 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1393,6 +1393,15 @@
'filters/decrypting_video_decoder_unittest.cc',
],
}],
+ # On non-Android systems we can test CdmAdapter using ExternalClearKey.
+ ['OS!="android"', {
+ 'dependencies': [
+ 'clearkeycdm',
+ ],
+ 'sources': [
+ 'cdm/cdm_adapter_unittest.cc',
+ ],
+ }],
['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
'sources': [
'filters/h264_bitstream_buffer_unittest.cc',
« media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('K') | « 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