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

Side by Side Diff: media/media.gyp

Issue 3035062: Revert 55400 - Cleanup in base. This moves the implementation (and a bunch of... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « media/ffmpeg/ffmpeg_unittest.cc ('k') | media/omx/run_all_unittests.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'player_x11_renderer%': 'x11', 8 'player_x11_renderer%': 'x11',
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 }], 175 }],
176 ], 176 ],
177 }, 177 },
178 { 178 {
179 'target_name': 'ffmpeg_unittests', 179 'target_name': 'ffmpeg_unittests',
180 'type': 'executable', 180 'type': 'executable',
181 'dependencies': [ 181 'dependencies': [
182 'media', 182 'media',
183 '../base/base.gyp:base', 183 '../base/base.gyp:base',
184 '../base/base.gyp:base_i18n', 184 '../base/base.gyp:base_i18n',
185 '../base/base.gyp:test_support_base',
186 '../base/base.gyp:test_support_perf', 185 '../base/base.gyp:test_support_perf',
187 '../testing/gtest.gyp:gtest', 186 '../testing/gtest.gyp:gtest',
188 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 187 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
189 ], 188 ],
190 'sources': [ 189 'sources': [
191 'ffmpeg/ffmpeg_unittest.cc', 190 'ffmpeg/ffmpeg_unittest.cc',
192 ], 191 ],
193 'conditions': [ 192 'conditions': [
194 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 193 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
195 'dependencies': [ 194 'dependencies': [
(...skipping 14 matching lines...) Expand all
210 ], 209 ],
211 }, 210 },
212 { 211 {
213 'target_name': 'media_unittests', 212 'target_name': 'media_unittests',
214 'type': 'executable', 213 'type': 'executable',
215 'msvs_guid': 'C8C6183C-B03C-11DD-B471-DFD256D89593', 214 'msvs_guid': 'C8C6183C-B03C-11DD-B471-DFD256D89593',
216 'dependencies': [ 215 'dependencies': [
217 'media', 216 'media',
218 '../base/base.gyp:base', 217 '../base/base.gyp:base',
219 '../base/base.gyp:base_i18n', 218 '../base/base.gyp:base_i18n',
220 '../base/base.gyp:test_support_base',
221 '../testing/gmock.gyp:gmock', 219 '../testing/gmock.gyp:gmock',
222 '../testing/gtest.gyp:gtest', 220 '../testing/gtest.gyp:gtest',
223 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 221 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
224 '../third_party/openmax/openmax.gyp:il', 222 '../third_party/openmax/openmax.gyp:il',
225 ], 223 ],
226 'sources!': [ 224 'sources!': [
227 '../third_party/openmax/omx_stub.cc', 225 '../third_party/openmax/omx_stub.cc',
228 ], 226 ],
229 'sources': [ 227 'sources': [
230 'audio/audio_input_controller_unittest.cc', 228 'audio/audio_input_controller_unittest.cc',
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 ], 463 ],
466 }, 464 },
467 { 465 {
468 'target_name': 'omx_unittests', 466 'target_name': 'omx_unittests',
469 'type': 'executable', 467 'type': 'executable',
470 'dependencies': [ 468 'dependencies': [
471 'media', 469 'media',
472 'omx_wrapper', 470 'omx_wrapper',
473 '../base/base.gyp:base', 471 '../base/base.gyp:base',
474 '../base/base.gyp:base_i18n', 472 '../base/base.gyp:base_i18n',
475 '../base/base.gyp:test_support_base',
476 '../testing/gtest.gyp:gtest', 473 '../testing/gtest.gyp:gtest',
477 ], 474 ],
478 'conditions': [ 475 'conditions': [
479 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 476 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
480 'dependencies': [ 477 'dependencies': [
481 '../build/linux/system.gyp:gtk', 478 '../build/linux/system.gyp:gtk',
482 ], 479 ],
483 }], 480 }],
484 ], 481 ],
485 'sources': [ 482 'sources': [
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 ], 562 ],
566 }], 563 }],
567 ], 564 ],
568 } 565 }
569 566
570 # Local Variables: 567 # Local Variables:
571 # tab-width:2 568 # tab-width:2
572 # indent-tabs-mode:nil 569 # indent-tabs-mode:nil
573 # End: 570 # End:
574 # vim: set expandtab tabstop=2 shiftwidth=2: 571 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_unittest.cc ('k') | media/omx/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698