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

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: 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 'base/filter_collection.cc', 278 'base/filter_collection.cc',
279 'base/filter_collection.h', 279 'base/filter_collection.h',
280 'base/keyboard_event_counter.cc', 280 'base/keyboard_event_counter.cc',
281 'base/keyboard_event_counter.h', 281 'base/keyboard_event_counter.h',
282 'base/media.cc', 282 'base/media.cc',
283 'base/media.h', 283 'base/media.h',
284 'base/media_file_checker.cc', 284 'base/media_file_checker.cc',
285 'base/media_file_checker.h', 285 'base/media_file_checker.h',
286 'base/media_keys.cc', 286 'base/media_keys.cc',
287 'base/media_keys.h', 287 'base/media_keys.h',
288 'base/media_keys_session_promise.cc',
289 'base/media_keys_session_promise.h',
288 'base/media_log.cc', 290 'base/media_log.cc',
289 'base/media_log.h', 291 'base/media_log.h',
290 'base/media_log_event.h', 292 'base/media_log_event.h',
291 'base/media_posix.cc', 293 'base/media_posix.cc',
292 'base/media_switches.cc', 294 'base/media_switches.cc',
293 'base/media_switches.h', 295 'base/media_switches.h',
294 'base/media_win.cc', 296 'base/media_win.cc',
295 'base/multi_channel_resampler.cc', 297 'base/multi_channel_resampler.cc',
296 'base/multi_channel_resampler.h', 298 'base/multi_channel_resampler.h',
297 'base/pipeline.cc', 299 'base/pipeline.cc',
(...skipping 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1477 }, 1479 },
1478 ], # targets 1480 ], # targets
1479 }], 1481 }],
1480 ['use_x11==1', { 1482 ['use_x11==1', {
1481 'targets': [ 1483 'targets': [
1482 { 1484 {
1483 'target_name': 'player_x11', 1485 'target_name': 'player_x11',
1484 'type': 'executable', 1486 'type': 'executable',
1485 'dependencies': [ 1487 'dependencies': [
1486 'media', 1488 'media',
1487 » 'shared_memory_support', 1489 'shared_memory_support',
1488 '../base/base.gyp:base', 1490 '../base/base.gyp:base',
1489 '../ui/gl/gl.gyp:gl', 1491 '../ui/gl/gl.gyp:gl',
1490 '../ui/gfx/gfx.gyp:gfx', 1492 '../ui/gfx/gfx.gyp:gfx',
1491 '../ui/gfx/gfx.gyp:gfx_geometry', 1493 '../ui/gfx/gfx.gyp:gfx_geometry',
1492 '../build/linux/system.gyp:x11', 1494 '../build/linux/system.gyp:x11',
1493 '../build/linux/system.gyp:xext', 1495 '../build/linux/system.gyp:xext',
1494 '../build/linux/system.gyp:xrender', 1496 '../build/linux/system.gyp:xrender',
1495 ], 1497 ],
1496 'conditions': [ 1498 'conditions': [
1497 # Linux/Solaris need libdl for dlopen() and friends. 1499 # Linux/Solaris need libdl for dlopen() and friends.
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 ], 1700 ],
1699 }], 1701 }],
1700 ], 1702 ],
1701 }], 1703 }],
1702 ], 1704 ],
1703 }, 1705 },
1704 ], 1706 ],
1705 }], 1707 }],
1706 ], 1708 ],
1707 } 1709 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698