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

Side by Side Diff: media/media.gyp

Issue 1969493002: Set hard_dependency for media and media_features gyp targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add hard_dep for main media target 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,
61 'variables': { 62 'variables': {
62 'buildflag_header_path': 'media/media_features.h', 63 'buildflag_header_path': 'media/media_features.h',
63 'buildflag_flags': [ 64 'buildflag_flags': [
64 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", 65 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)",
65 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", 66 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)",
66 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" , 67 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" ,
67 "ENABLE_MP4_VP9_DEMUXING=0", 68 "ENABLE_MP4_VP9_DEMUXING=0",
68 ], 69 ],
69 }, 70 },
70 }, 71 },
(...skipping 11 matching lines...) Expand all
82 '../skia/skia.gyp:skia', 83 '../skia/skia.gyp:skia',
83 '../third_party/libwebm/libwebm.gyp:libwebm', 84 '../third_party/libwebm/libwebm.gyp:libwebm',
84 '../third_party/libyuv/libyuv.gyp:libyuv', 85 '../third_party/libyuv/libyuv.gyp:libyuv',
85 '../third_party/opus/opus.gyp:opus', 86 '../third_party/opus/opus.gyp:opus',
86 '../ui/events/events.gyp:events_base', 87 '../ui/events/events.gyp:events_base',
87 '../ui/gfx/gfx.gyp:gfx', 88 '../ui/gfx/gfx.gyp:gfx',
88 '../ui/gfx/gfx.gyp:gfx_geometry', 89 '../ui/gfx/gfx.gyp:gfx_geometry',
89 '../url/url.gyp:url_lib', 90 '../url/url.gyp:url_lib',
90 'shared_memory_support', 91 'shared_memory_support',
91 ], 92 ],
93 'hard_dependency': 1,
92 'export_dependent_settings': [ 94 'export_dependent_settings': [
93 '../third_party/libwebm/libwebm.gyp:libwebm', 95 '../third_party/libwebm/libwebm.gyp:libwebm',
94 '../third_party/opus/opus.gyp:opus', 96 '../third_party/opus/opus.gyp:opus',
95 ], 97 ],
tapted 2016/05/12 02:41:37 I think export_dependent_settings also needs to in
96 'defines': [ 98 'defines': [
97 'MEDIA_IMPLEMENTATION', 99 'MEDIA_IMPLEMENTATION',
98 ], 100 ],
99 'include_dirs': [ 101 'include_dirs': [
100 '..', 102 '..',
101 ], 103 ],
102 'includes': [ 104 'includes': [
103 'capture.gypi', 105 'capture.gypi',
104 ], 106 ],
105 'sources': [ 107 'sources': [
(...skipping 2175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2281 'dependencies': [ 2283 'dependencies': [
2282 '../build/linux/system.gyp:libdrm', 2284 '../build/linux/system.gyp:libdrm',
2283 ] 2285 ]
2284 }], 2286 }],
2285 ], 2287 ],
2286 } 2288 }
2287 ] 2289 ]
2288 }], 2290 }],
2289 ], 2291 ],
2290 } 2292 }
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