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

Side by Side Diff: media/media.gyp

Issue 474693002: Changes to media.gyp for Chromoting iOS client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update gn as well Created 6 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 | « media/base/BUILD.gn ('k') | media/media_options.gni » ('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 (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
11 # (DT_NEEDED) instead of using dlopen. This helps with automated 11 # (DT_NEEDED) instead of using dlopen. This helps with automated
12 # detection of ABI mismatches and prevents silent errors. 12 # detection of ABI mismatches and prevents silent errors.
13 'linux_link_pulseaudio%': 0, 13 'linux_link_pulseaudio%': 0,
14 'conditions': [ 14 'conditions': [
15 ['OS=="android"', { 15 ['OS=="android" or OS=="ios"', {
16 # Android doesn't use ffmpeg. 16 # Android and iOS don't use ffmpeg or libvpx.
17 'media_use_ffmpeg%': 0, 17 'media_use_ffmpeg%': 0,
18 # Android doesn't use libvpx.
19 'media_use_libvpx%': 0, 18 'media_use_libvpx%': 0,
20 }, { # 'OS!="android"' 19 }, { # 'OS!="android" and OS!="ios"'
21 'media_use_ffmpeg%': 1, 20 'media_use_ffmpeg%': 1,
22 'media_use_libvpx%': 1, 21 'media_use_libvpx%': 1,
23 }], 22 }],
24 # Enable ALSA and Pulse for runtime selection. 23 # Enable ALSA and Pulse for runtime selection.
25 ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and (embedded!=1 or (chr omecast==1 and target_arch!="arm"))', { 24 ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and (embedded!=1 or (chr omecast==1 and target_arch!="arm"))', {
26 # ALSA is always needed for Web MIDI even if the cras is enabled. 25 # ALSA is always needed for Web MIDI even if the cras is enabled.
27 'use_alsa%': 1, 26 'use_alsa%': 1,
28 'conditions': [ 27 'conditions': [
29 ['use_cras==1', { 28 ['use_cras==1', {
30 'use_pulseaudio%': 0, 29 'use_pulseaudio%': 0,
(...skipping 19 matching lines...) Expand all
50 { 49 {
51 'target_name': 'media', 50 'target_name': 'media',
52 'type': '<(component)', 51 'type': '<(component)',
53 'dependencies': [ 52 'dependencies': [
54 '../base/base.gyp:base', 53 '../base/base.gyp:base',
55 '../base/base.gyp:base_i18n', 54 '../base/base.gyp:base_i18n',
56 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 55 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
57 '../crypto/crypto.gyp:crypto', 56 '../crypto/crypto.gyp:crypto',
58 '../gpu/gpu.gyp:command_buffer_common', 57 '../gpu/gpu.gyp:command_buffer_common',
59 '../skia/skia.gyp:skia', 58 '../skia/skia.gyp:skia',
59 '../third_party/libyuv/libyuv.gyp:libyuv',
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',
66 ], 66 ],
67 'defines': [ 67 'defines': [
68 'MEDIA_IMPLEMENTATION', 68 'MEDIA_IMPLEMENTATION',
69 ], 69 ],
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 'DISABLE_USER_INPUT_MONITOR', 650 'DISABLE_USER_INPUT_MONITOR',
651 ], 651 ],
652 }], 652 }],
653 # For VaapiVideoEncodeAccelerator. 653 # For VaapiVideoEncodeAccelerator.
654 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 654 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
655 'sources': [ 655 'sources': [
656 'filters/h264_bitstream_buffer.cc', 656 'filters/h264_bitstream_buffer.cc',
657 'filters/h264_bitstream_buffer.h', 657 'filters/h264_bitstream_buffer.h',
658 ], 658 ],
659 }], 659 }],
660 ['OS!="ios"', {
661 'dependencies': [
662 '../third_party/libyuv/libyuv.gyp:libyuv',
663 ],
664 }],
665 ['use_alsa==1', { 660 ['use_alsa==1', {
666 'link_settings': { 661 'link_settings': {
667 'libraries': [ 662 'libraries': [
668 '-lasound', 663 '-lasound',
669 ], 664 ],
670 }, 665 },
671 'defines': [ 666 'defines': [
672 'USE_ALSA', 667 'USE_ALSA',
673 ], 668 ],
674 }, { # use_alsa==0 669 }, { # use_alsa==0
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 ['target_arch=="x64"', { 1430 ['target_arch=="x64"', {
1436 # Source files optimized for X64 systems. 1431 # Source files optimized for X64 systems.
1437 'sources': [ 1432 'sources': [
1438 'base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm', 1433 'base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm',
1439 'base/simd/scale_yuv_to_rgb_sse2_x64.asm', 1434 'base/simd/scale_yuv_to_rgb_sse2_x64.asm',
1440 ], 1435 ],
1441 'variables': { 1436 'variables': {
1442 'yasm_flags': ['-DARCH_X86_64'], 1437 'yasm_flags': ['-DARCH_X86_64'],
1443 }, 1438 },
1444 }], 1439 }],
1445 ['OS=="mac"', { 1440 ['OS=="mac" or OS=="ios"', {
1446 'variables': { 1441 'variables': {
1447 'yasm_flags': [ 1442 'yasm_flags': [
1448 '-DPREFIX', 1443 '-DPREFIX',
1449 '-DMACHO', 1444 '-DMACHO',
1450 ], 1445 ],
1451 }, 1446 },
1452 'sources': [ 1447 'sources': [
1453 # XCode doesn't want to link a pure assembly target and will 1448 # XCode doesn't want to link a pure assembly target and will
1454 # fail to link when it creates an empty file list. So add a 1449 # fail to link when it creates an empty file list. So add a
1455 # dummy file keep the linker happy. See http://crbug.com/157073 1450 # dummy file keep the linker happy. See http://crbug.com/157073
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 ], 1742 ],
1748 }], 1743 }],
1749 ], 1744 ],
1750 }], 1745 }],
1751 ], 1746 ],
1752 }, 1747 },
1753 ], 1748 ],
1754 }], 1749 }],
1755 ], 1750 ],
1756 } 1751 }
OLDNEW
« no previous file with comments | « media/base/BUILD.gn ('k') | media/media_options.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698