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

Side by Side Diff: media/media.gyp

Issue 126170: Make the generated stubs weak. Enable the unittests that had conflicting symbols. (Closed)
Patch Set: Fix indent.w Created 11 years, 6 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/filters/video_renderer_unittest.cc ('k') | third_party/ffmpeg/generate_stubs.py » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 ], 164 ],
165 'conditions': [ 165 'conditions': [
166 ['OS=="linux"', { 166 ['OS=="linux"', {
167 'dependencies': [ 167 'dependencies': [
168 # Needed for the following #include chain: 168 # Needed for the following #include chain:
169 # base/run_all_unittests.cc 169 # base/run_all_unittests.cc
170 # ../base/test_suite.h 170 # ../base/test_suite.h
171 # gtk/gtk.h 171 # gtk/gtk.h
172 '../build/linux/system.gyp:gtk', 172 '../build/linux/system.gyp:gtk',
173 ], 173 ],
174 'sources!': [
175 'filters/ffmpeg_demuxer_unittest.cc',
176 'filters/ffmpeg_glue_unittest.cc',
177 'filters/ffmpeg_video_decoder_unittest.cc',
178 ],
179 }],
180 ['OS=="mac"', {
181 'sources!': [
182 'filters/ffmpeg_demuxer_unittest.cc',
183 'filters/ffmpeg_glue_unittest.cc',
184 'filters/ffmpeg_video_decoder_unittest.cc',
185 ],
186 }], 174 }],
187 ], 175 ],
188 }, 176 },
189 { 177 {
190 'target_name': 'media_bench', 178 'target_name': 'media_bench',
191 'type': 'executable', 179 'type': 'executable',
192 'msvs_guid': '45BC4F87-4604-4962-A751-7C7B29A080BF', 180 'msvs_guid': '45BC4F87-4604-4962-A751-7C7B29A080BF',
193 'dependencies': [ 181 'dependencies': [
194 'media', 182 'media',
195 '../base/base.gyp:base', 183 '../base/base.gyp:base',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 'msvs_settings': { 225 'msvs_settings': {
238 'VCLinkerTool': { 226 'VCLinkerTool': {
239 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 227 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
240 }, 228 },
241 }, 229 },
242 }, 230 },
243 ], 231 ],
244 }], 232 }],
245 ], 233 ],
246 } 234 }
OLDNEW
« no previous file with comments | « media/filters/video_renderer_unittest.cc ('k') | third_party/ffmpeg/generate_stubs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698