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

Side by Side Diff: media/media.gyp

Issue 1975483002: Revert of Set hard_dependency for media and media_features gyp targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | 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
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 'includes': [ 51 'includes': [
52 'capture.gypi', 52 'capture.gypi',
53 'media_cdm.gypi', 53 'media_cdm.gypi',
54 'media_variables.gypi', 54 'media_variables.gypi',
55 ], 55 ],
56 'targets': [ 56 'targets': [
57 { 57 {
58 # GN version: //media:media_features 58 # GN version: //media:media_features
59 'target_name': 'media_features', 59 'target_name': 'media_features',
60 'includes': [ '../build/buildflag_header.gypi' ], 60 'includes': [ '../build/buildflag_header.gypi' ],
61 'hard_dependency': 1,
62 'variables': { 61 'variables': {
63 'buildflag_header_path': 'media/media_features.h', 62 'buildflag_header_path': 'media/media_features.h',
64 'buildflag_flags': [ 63 'buildflag_flags': [
65 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", 64 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)",
66 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", 65 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)",
67 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" , 66 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" ,
68 "ENABLE_MP4_VP9_DEMUXING=0", 67 "ENABLE_MP4_VP9_DEMUXING=0",
69 ], 68 ],
70 }, 69 },
71 }, 70 },
(...skipping 11 matching lines...) Expand all
83 '../skia/skia.gyp:skia', 82 '../skia/skia.gyp:skia',
84 '../third_party/libwebm/libwebm.gyp:libwebm', 83 '../third_party/libwebm/libwebm.gyp:libwebm',
85 '../third_party/libyuv/libyuv.gyp:libyuv', 84 '../third_party/libyuv/libyuv.gyp:libyuv',
86 '../third_party/opus/opus.gyp:opus', 85 '../third_party/opus/opus.gyp:opus',
87 '../ui/events/events.gyp:events_base', 86 '../ui/events/events.gyp:events_base',
88 '../ui/gfx/gfx.gyp:gfx', 87 '../ui/gfx/gfx.gyp:gfx',
89 '../ui/gfx/gfx.gyp:gfx_geometry', 88 '../ui/gfx/gfx.gyp:gfx_geometry',
90 '../url/url.gyp:url_lib', 89 '../url/url.gyp:url_lib',
91 'shared_memory_support', 90 'shared_memory_support',
92 ], 91 ],
93 'hard_dependency': 1,
94 'export_dependent_settings': [ 92 'export_dependent_settings': [
95 '../third_party/libwebm/libwebm.gyp:libwebm', 93 '../third_party/libwebm/libwebm.gyp:libwebm',
96 '../third_party/opus/opus.gyp:opus', 94 '../third_party/opus/opus.gyp:opus',
97 ], 95 ],
98 'defines': [ 96 'defines': [
99 'MEDIA_IMPLEMENTATION', 97 'MEDIA_IMPLEMENTATION',
100 ], 98 ],
101 'include_dirs': [ 99 'include_dirs': [
102 '..', 100 '..',
103 ], 101 ],
(...skipping 2179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2283 'dependencies': [ 2281 'dependencies': [
2284 '../build/linux/system.gyp:libdrm', 2282 '../build/linux/system.gyp:libdrm',
2285 ] 2283 ]
2286 }], 2284 }],
2287 ], 2285 ],
2288 } 2286 }
2289 ] 2287 ]
2290 }], 2288 }],
2291 ], 2289 ],
2292 } 2290 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698