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

Side by Side Diff: chromecast/media/media.gyp

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename createSession to createSessionFromNative to avoid bug in FindBugs Created 5 years, 7 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 | « chromecast/media/cdm/playready_drm_delegate_android.cc ('k') | components/OWNERS » ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'chromecast_branding%': 'Chromium', 8 'chromecast_branding%': 'Chromium',
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 'type': '<(component)', 47 'type': '<(component)',
48 'dependencies': [ 48 'dependencies': [
49 'media_base', 49 'media_base',
50 '../../base/base.gyp:base', 50 '../../base/base.gyp:base',
51 '../../media/media.gyp:media', 51 '../../media/media.gyp:media',
52 ], 52 ],
53 'sources': [ 53 'sources': [
54 'cdm/browser_cdm_cast.cc', 54 'cdm/browser_cdm_cast.cc',
55 'cdm/browser_cdm_cast.h', 55 'cdm/browser_cdm_cast.h',
56 ], 56 ],
57 'conditions': [
58 ['use_playready==1', {
59 'sources': [
60 'cdm/playready_drm_delegate_android.cc',
61 'cdm/playready_drm_delegate_android.h',
62 ],
63 }],
64 ],
57 }, 65 },
58 { 66 {
59 'target_name': 'cma_base', 67 'target_name': 'cma_base',
60 'type': '<(component)', 68 'type': '<(component)',
61 'dependencies': [ 69 'dependencies': [
62 '../chromecast.gyp:cast_base', 70 '../chromecast.gyp:cast_base',
63 '../../base/base.gyp:base', 71 '../../base/base.gyp:base',
64 '../../media/media.gyp:media', 72 '../../media/media.gyp:media',
65 ], 73 ],
66 'include_dirs': [ 74 'include_dirs': [
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 'cma/test/media_component_device_feeder_for_test.h', 287 'cma/test/media_component_device_feeder_for_test.h',
280 'cma/test/mock_frame_consumer.cc', 288 'cma/test/mock_frame_consumer.cc',
281 'cma/test/mock_frame_consumer.h', 289 'cma/test/mock_frame_consumer.h',
282 'cma/test/mock_frame_provider.cc', 290 'cma/test/mock_frame_provider.cc',
283 'cma/test/mock_frame_provider.h', 291 'cma/test/mock_frame_provider.h',
284 'cma/test/run_all_unittests.cc', 292 'cma/test/run_all_unittests.cc',
285 ], 293 ],
286 }, 294 },
287 ], 295 ],
288 } 296 }
OLDNEW
« no previous file with comments | « chromecast/media/cdm/playready_drm_delegate_android.cc ('k') | components/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698