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

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: rebase 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 240 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 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 }, 1508 },
1507 ], # targets 1509 ], # targets
1508 }], 1510 }],
1509 ['use_x11==1', { 1511 ['use_x11==1', {
1510 'targets': [ 1512 'targets': [
1511 { 1513 {
1512 'target_name': 'player_x11', 1514 'target_name': 'player_x11',
1513 'type': 'executable', 1515 'type': 'executable',
1514 'dependencies': [ 1516 'dependencies': [
1515 'media', 1517 'media',
1516 » 'shared_memory_support', 1518 'shared_memory_support',
1517 '../base/base.gyp:base', 1519 '../base/base.gyp:base',
1518 '../ui/gl/gl.gyp:gl', 1520 '../ui/gl/gl.gyp:gl',
1519 '../ui/gfx/gfx.gyp:gfx', 1521 '../ui/gfx/gfx.gyp:gfx',
1520 '../ui/gfx/gfx.gyp:gfx_geometry', 1522 '../ui/gfx/gfx.gyp:gfx_geometry',
1521 '../build/linux/system.gyp:x11', 1523 '../build/linux/system.gyp:x11',
1522 '../build/linux/system.gyp:xext', 1524 '../build/linux/system.gyp:xext',
1523 '../build/linux/system.gyp:xrender', 1525 '../build/linux/system.gyp:xrender',
1524 ], 1526 ],
1525 'conditions': [ 1527 'conditions': [
1526 # Linux/Solaris need libdl for dlopen() and friends. 1528 # Linux/Solaris need libdl for dlopen() and friends.
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 ], 1728 ],
1727 }], 1729 }],
1728 ], 1730 ],
1729 }], 1731 }],
1730 ], 1732 ],
1731 }, 1733 },
1732 ], 1734 ],
1733 }], 1735 }],
1734 ], 1736 ],
1735 } 1737 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698