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

Side by Side Diff: media/media.gyp

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: latest CDM_5 Created 6 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 }, 45 },
46 'includes': [ 46 'includes': [
47 'media_cdm.gypi', 47 'media_cdm.gypi',
48 ], 48 ],
49 'targets': [ 49 'targets': [
50 { 50 {
51 'target_name': 'media', 51 'target_name': 'media',
52 'type': '<(component)', 52 'type': '<(component)',
53 'dependencies': [ 53 'dependencies': [
54 '../base/base.gyp:base', 54 '../base/base.gyp:base',
55 » '../base/base.gyp:base_i18n', 55 '../base/base.gyp:base_i18n',
56 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 56 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
57 '../crypto/crypto.gyp:crypto', 57 '../crypto/crypto.gyp:crypto',
58 '../gpu/gpu.gyp:command_buffer_common', 58 '../gpu/gpu.gyp:command_buffer_common',
59 '../skia/skia.gyp:skia', 59 '../skia/skia.gyp:skia',
60 '../third_party/opus/opus.gyp:opus', 60 '../third_party/opus/opus.gyp:opus',
61 '../ui/events/events.gyp:events_base', 61 '../ui/events/events.gyp:events_base',
62 '../ui/gfx/gfx.gyp:gfx', 62 '../ui/gfx/gfx.gyp:gfx',
63 '../ui/gfx/gfx.gyp:gfx_geometry', 63 '../ui/gfx/gfx.gyp:gfx_geometry',
64 '../url/url.gyp:url_lib', 64 '../url/url.gyp:url_lib',
65 'shared_memory_support', 65 'shared_memory_support',
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 'base/buffering_state.h', 251 'base/buffering_state.h',
252 'base/buffers.h', 252 'base/buffers.h',
253 'base/byte_queue.cc', 253 'base/byte_queue.cc',
254 'base/byte_queue.h', 254 'base/byte_queue.h',
255 'base/channel_mixer.cc', 255 'base/channel_mixer.cc',
256 'base/channel_mixer.h', 256 'base/channel_mixer.h',
257 'base/clock.cc', 257 'base/clock.cc',
258 'base/clock.h', 258 'base/clock.h',
259 'base/container_names.cc', 259 'base/container_names.cc',
260 'base/container_names.h', 260 'base/container_names.h',
261 'base/cdm_promise.cc',
262 'base/cdm_promise.h',
261 'base/data_buffer.cc', 263 'base/data_buffer.cc',
262 'base/data_buffer.h', 264 'base/data_buffer.h',
263 'base/data_source.cc', 265 'base/data_source.cc',
264 'base/data_source.h', 266 'base/data_source.h',
265 'base/decoder_buffer.cc', 267 'base/decoder_buffer.cc',
266 'base/decoder_buffer.h', 268 'base/decoder_buffer.h',
267 'base/decoder_buffer_queue.cc', 269 'base/decoder_buffer_queue.cc',
268 'base/decoder_buffer_queue.h', 270 'base/decoder_buffer_queue.h',
269 'base/decrypt_config.cc', 271 'base/decrypt_config.cc',
270 'base/decrypt_config.h', 272 'base/decrypt_config.h',
(...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1491 }, 1493 },
1492 ], # targets 1494 ], # targets
1493 }], 1495 }],
1494 ['use_x11==1', { 1496 ['use_x11==1', {
1495 'targets': [ 1497 'targets': [
1496 { 1498 {
1497 'target_name': 'player_x11', 1499 'target_name': 'player_x11',
1498 'type': 'executable', 1500 'type': 'executable',
1499 'dependencies': [ 1501 'dependencies': [
1500 'media', 1502 'media',
1501 » 'shared_memory_support', 1503 'shared_memory_support',
1502 '../base/base.gyp:base', 1504 '../base/base.gyp:base',
1503 '../ui/gl/gl.gyp:gl', 1505 '../ui/gl/gl.gyp:gl',
1504 '../ui/gfx/gfx.gyp:gfx', 1506 '../ui/gfx/gfx.gyp:gfx',
1505 '../ui/gfx/gfx.gyp:gfx_geometry', 1507 '../ui/gfx/gfx.gyp:gfx_geometry',
1506 '../build/linux/system.gyp:x11', 1508 '../build/linux/system.gyp:x11',
1507 '../build/linux/system.gyp:xext', 1509 '../build/linux/system.gyp:xext',
1508 '../build/linux/system.gyp:xrender', 1510 '../build/linux/system.gyp:xrender',
1509 ], 1511 ],
1510 'conditions': [ 1512 'conditions': [
1511 # Linux/Solaris need libdl for dlopen() and friends. 1513 # Linux/Solaris need libdl for dlopen() and friends.
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 ], 1713 ],
1712 }], 1714 }],
1713 ], 1715 ],
1714 }], 1716 }],
1715 ], 1717 ],
1716 }, 1718 },
1717 ], 1719 ],
1718 }], 1720 }],
1719 ], 1721 ],
1720 } 1722 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698