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

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

Issue 1266723002: Revert of [Chromecast] Change chromecast_branding to public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/base/BUILD.gn ('k') | chromecast/tools/build/chromecast_repack_locales.py » ('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%': 'public', 8 'chromecast_branding%': 'Chromium',
9 'libcast_media_gyp%': '', 9 'libcast_media_gyp%': '',
10 'use_default_libcast_media%': 1, 10 'use_default_libcast_media%': 1,
11 }, 11 },
12 'targets': [ 12 'targets': [
13 # TODO(gunsch): delete this target once Chromecast M44/earlier is obsolete. 13 # TODO(gunsch): delete this target once Chromecast M44/earlier is obsolete.
14 # See: b/21639416 14 # See: b/21639416
15 { 15 {
16 'target_name': 'libffmpegsumo', 16 'target_name': 'libffmpegsumo',
17 'type': 'loadable_module', 17 'type': 'loadable_module',
18 'sources': ['empty.cc'], 18 'sources': ['empty.cc'],
(...skipping 17 matching lines...) Expand all
36 'base/media_caps.cc', 36 'base/media_caps.cc',
37 'base/media_caps.h', 37 'base/media_caps.h',
38 'base/media_codec_support.cc', 38 'base/media_codec_support.cc',
39 'base/media_codec_support.h', 39 'base/media_codec_support.h',
40 'base/media_message_loop.cc', 40 'base/media_message_loop.cc',
41 'base/media_message_loop.h', 41 'base/media_message_loop.h',
42 'base/switching_media_renderer.cc', 42 'base/switching_media_renderer.cc',
43 'base/switching_media_renderer.h', 43 'base/switching_media_renderer.h',
44 ], 44 ],
45 'conditions': [ 45 'conditions': [
46 ['chromecast_branding!="public"', { 46 ['chromecast_branding=="Chrome"', {
47 'dependencies': [ 47 'dependencies': [
48 '../internal/chromecast_internal.gyp:media_base_internal', 48 '../internal/chromecast_internal.gyp:media_base_internal',
49 ], 49 ],
50 }, { 50 }, {
51 'sources': [ 51 'sources': [
52 'base/key_systems_common_simple.cc', 52 'base/key_systems_common_simple.cc',
53 ], 53 ],
54 }], 54 }],
55 ], 55 ],
56 }, 56 },
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 'cma/backend/media_pipeline_device_factory_default.cc', 145 'cma/backend/media_pipeline_device_factory_default.cc',
146 'cma/backend/media_pipeline_device_factory_default.h', 146 'cma/backend/media_pipeline_device_factory_default.h',
147 'cma/backend/media_pipeline_device_params.cc', 147 'cma/backend/media_pipeline_device_params.cc',
148 'cma/backend/media_pipeline_device_params.h', 148 'cma/backend/media_pipeline_device_params.h',
149 'cma/backend/video_pipeline_device.cc', 149 'cma/backend/video_pipeline_device.cc',
150 'cma/backend/video_pipeline_device_default.cc', 150 'cma/backend/video_pipeline_device_default.cc',
151 'cma/backend/video_pipeline_device_default.h', 151 'cma/backend/video_pipeline_device_default.h',
152 'cma/backend/video_pipeline_device.h', 152 'cma/backend/video_pipeline_device.h',
153 ], 153 ],
154 'conditions': [ 154 'conditions': [
155 ['chromecast_branding!="public"', { 155 ['chromecast_branding=="Chrome"', {
156 'dependencies': [ 156 'dependencies': [
157 '../internal/chromecast_internal.gyp:cma_backend_internal', 157 '../internal/chromecast_internal.gyp:cma_backend_internal',
158 ], 158 ],
159 }, { 159 }, {
160 'sources': [ 160 'sources': [
161 'cma/backend/media_pipeline_device_factory_simple.cc' 161 'cma/backend/media_pipeline_device_factory_simple.cc'
162 ], 162 ],
163 }], 163 }],
164 ], 164 ],
165 }, 165 },
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 '../..', 327 '../..',
328 ], 328 ],
329 'sources': [ 329 'sources': [
330 'base/cast_media_default.cc', 330 'base/cast_media_default.cc',
331 ], 331 ],
332 } 332 }
333 ] 333 ]
334 }], 334 }],
335 ], 335 ],
336 } 336 }
OLDNEW
« no previous file with comments | « chromecast/media/base/BUILD.gn ('k') | chromecast/tools/build/chromecast_repack_locales.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698