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

Side by Side Diff: media/blink/media_blink.gyp

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 years, 10 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/blink/encrypted_media_player_support.cc ('k') | media/blink/webmediaplayer_impl.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'includes': [ 6 'includes': [
7 '../media_variables.gypi' 7 '../media_variables.gypi'
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 27 matching lines...) Expand all
38 'buffered_data_source_host_impl.h', 38 'buffered_data_source_host_impl.h',
39 'buffered_resource_loader.cc', 39 'buffered_resource_loader.cc',
40 'buffered_resource_loader.h', 40 'buffered_resource_loader.h',
41 'cache_util.cc', 41 'cache_util.cc',
42 'cache_util.h', 42 'cache_util.h',
43 'cdm_result_promise.h', 43 'cdm_result_promise.h',
44 'cdm_result_promise_helper.cc', 44 'cdm_result_promise_helper.cc',
45 'cdm_result_promise_helper.h', 45 'cdm_result_promise_helper.h',
46 'cdm_session_adapter.cc', 46 'cdm_session_adapter.cc',
47 'cdm_session_adapter.h', 47 'cdm_session_adapter.h',
48 'encrypted_media_player_support.cc',
49 'encrypted_media_player_support.h',
50 'interval_map.h', 48 'interval_map.h',
51 'key_system_config_selector.cc', 49 'key_system_config_selector.cc',
52 'key_system_config_selector.h', 50 'key_system_config_selector.h',
53 'lru.h', 51 'lru.h',
54 'media_blink_export.h', 52 'media_blink_export.h',
55 'multibuffer.cc', 53 'multibuffer.cc',
56 'multibuffer.h', 54 'multibuffer.h',
57 'multibuffer_data_source.cc', 55 'multibuffer_data_source.cc',
58 'multibuffer_data_source.h', 56 'multibuffer_data_source.h',
59 'multibuffer_reader.cc', 57 'multibuffer_reader.cc',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ], 92 ],
95 'conditions': [ 93 'conditions': [
96 ['OS=="android" and media_use_ffmpeg==1', { 94 ['OS=="android" and media_use_ffmpeg==1', {
97 'sources': [ 95 'sources': [
98 'webmediaplayer_cast_android.cc', 96 'webmediaplayer_cast_android.cc',
99 'webmediaplayer_cast_android.h', 97 'webmediaplayer_cast_android.h',
100 ], 98 ],
101 }], 99 }],
102 ['OS=="android" and media_use_ffmpeg==0', { 100 ['OS=="android" and media_use_ffmpeg==0', {
103 'sources!': [ 101 'sources!': [
104 'encrypted_media_player_support.cc',
105 'encrypted_media_player_support.h',
106 'webmediaplayer_impl.cc', 102 'webmediaplayer_impl.cc',
107 'webmediaplayer_impl.h', 103 'webmediaplayer_impl.h',
108 ], 104 ],
109 }], 105 }],
110 ], 106 ],
111 }, 107 },
112 { 108 {
113 'target_name': 'media_blink_unittests', 109 'target_name': 'media_blink_unittests',
114 'type': '<(gtest_target_type)', 110 'type': '<(gtest_target_type)',
115 'dependencies': [ 111 'dependencies': [
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 174 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
179 ], 175 ],
180 } 176 }
181 ], 177 ],
182 ], 178 ],
183 }, 179 },
184 ], 180 ],
185 }], 181 }],
186 ], 182 ],
187 } 183 }
OLDNEW
« no previous file with comments | « media/blink/encrypted_media_player_support.cc ('k') | media/blink/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698