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

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

Issue 1230793009: Initial support for the desktop media pipeline on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build_ffmpegsumo is gone! yay Created 5 years, 5 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 | « content/renderer/render_frame_impl.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('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': [
7 '../media_variables.gypi'
8 ],
6 'targets': [ 9 'targets': [
7 { 10 {
8 # GN version: //media/blink 11 # GN version: //media/blink
9 'target_name': 'media_blink', 12 'target_name': 'media_blink',
10 'type': '<(component)', 13 'type': '<(component)',
11 'dependencies': [ 14 'dependencies': [
12 '../../base/base.gyp:base', 15 '../../base/base.gyp:base',
13 '../../cc/cc.gyp:cc', 16 '../../cc/cc.gyp:cc',
14 '../../cc/blink/cc_blink.gyp:cc_blink', 17 '../../cc/blink/cc_blink.gyp:cc_blink',
15 '../../gpu/blink/gpu_blink.gyp:gpu_blink', 18 '../../gpu/blink/gpu_blink.gyp:gpu_blink',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'webmediaplayer_params.cc', 72 'webmediaplayer_params.cc',
70 'webmediaplayer_params.h', 73 'webmediaplayer_params.h',
71 'webmediaplayer_util.cc', 74 'webmediaplayer_util.cc',
72 'webmediaplayer_util.h', 75 'webmediaplayer_util.h',
73 'webmediasource_impl.cc', 76 'webmediasource_impl.cc',
74 'webmediasource_impl.h', 77 'webmediasource_impl.h',
75 'websourcebuffer_impl.cc', 78 'websourcebuffer_impl.cc',
76 'websourcebuffer_impl.h', 79 'websourcebuffer_impl.h',
77 ], 80 ],
78 'conditions': [ 81 'conditions': [
79 ['OS=="android"', { 82 ['OS=="android" and media_use_ffmpeg==0', {
80 'sources!': [ 83 'sources!': [
81 'encrypted_media_player_support.cc', 84 'encrypted_media_player_support.cc',
82 'encrypted_media_player_support.h', 85 'encrypted_media_player_support.h',
83 'webmediaplayer_impl.cc', 86 'webmediaplayer_impl.cc',
84 'webmediaplayer_impl.h', 87 'webmediaplayer_impl.h',
85 ], 88 ],
86 }], 89 }],
87 ], 90 ],
88 }, 91 },
89 { 92 {
(...skipping 28 matching lines...) Expand all
118 'mock_weburlloader.h', 121 'mock_weburlloader.h',
119 'run_all_unittests.cc', 122 'run_all_unittests.cc',
120 'test_response_generator.cc', 123 'test_response_generator.cc',
121 'test_response_generator.h', 124 'test_response_generator.h',
122 'video_frame_compositor_unittest.cc', 125 'video_frame_compositor_unittest.cc',
123 'webaudiosourceprovider_impl_unittest.cc', 126 'webaudiosourceprovider_impl_unittest.cc',
124 ], 127 ],
125 }, 128 },
126 ] 129 ]
127 } 130 }
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698