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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 6901036: Update VideoDecode PPAPI structs to be consistent with media structures, part 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make try bots happy Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/pepper_platform_video_decoder_impl.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'pyautolib_sources': [ 7 'pyautolib_sources': [
8 'app/chrome_command_ids.h', 8 'app/chrome_command_ids.h',
9 'app/chrome_dll_resource.h', 9 'app/chrome_dll_resource.h',
10 'common/automation_constants.h', 10 'common/automation_constants.h',
(...skipping 3317 matching lines...) Expand 10 before | Expand all | Expand 10 after
3328 '../build/linux/system.gyp:nss', 3328 '../build/linux/system.gyp:nss',
3329 ], 3329 ],
3330 }], 3330 }],
3331 ['toolkit_views==1', { 3331 ['toolkit_views==1', {
3332 'dependencies': [ 3332 'dependencies': [
3333 '../views/views.gyp:views', 3333 '../views/views.gyp:views',
3334 ], 3334 ],
3335 }], 3335 }],
3336 ], 3336 ],
3337 }, 3337 },
3338 { 3338 # {
3339 # Executable that contains tests that specifically test gpu video decoding 3339 # Executable that contains tests that specifically test gpu video decoding
3340 # features. Excludes for example command buffer implementation. 3340 # features. Excludes for example command buffer implementation.
3341 'target_name': 'gpu_video_tests', 3341 #
3342 'type': 'executable', 3342 # TODO(vrk): These tests are temporarily disabled as the VideoDecode PPAPI
3343 'dependencies': [ 3343 # is getting an overhaul. Tests will be reenabled when the API has been
3344 'test_support_common', 3344 # stabilized and gpu_video_decode_accelerator_test.cc is updated to
3345 '../base/base.gyp:base', 3345 # reflect the changes.
3346 '../base/base.gyp:base_i18n', 3346 #
3347 '../base/base.gyp:test_support_base', 3347 # 'target_name': 'gpu_video_tests',
3348 '../ipc/ipc.gyp:test_support_ipc', 3348 # 'type': 'executable',
3349 '../skia/skia.gyp:skia', 3349 # 'dependencies': [
3350 '../testing/gtest.gyp:gtest', 3350 # 'test_support_common',
3351 '../testing/gmock.gyp:gmock', 3351 # '../base/base.gyp:base',
3352 ], 3352 # '../base/base.gyp:base_i18n',
3353 'include_dirs': [ 3353 # '../base/base.gyp:test_support_base',
3354 '..', 3354 # '../ipc/ipc.gyp:test_support_ipc',
3355 ], 3355 # '../skia/skia.gyp:skia',
3356 'sources': [ 3356 # '../testing/gtest.gyp:gtest',
3357 '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.cc', 3357 # '../testing/gmock.gyp:gmock',
3358 '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.h', 3358 # ],
3359 '<(DEPTH)/content/gpu/gpu_video_decode_accelerator_tester.cc', 3359 # 'include_dirs': [
3360 '<(DEPTH)/media/video/picture.cc', 3360 # '..',
3361 '<(DEPTH)/media/video/picture.h', 3361 # ],
3362 '<(DEPTH)/media/video/video_decode_accelerator.cc', 3362 # 'sources': [
3363 '<(DEPTH)/media/video/video_decode_accelerator.h', 3363 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.cc',
3364 '<(DEPTH)/ui/gfx/size.cc', 3364 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.h',
3365 '<(DEPTH)/ui/gfx/size.h', 3365 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator_tester.cc',
3366 ], 3366 # '<(DEPTH)/media/video/picture.cc',
3367 }, 3367 # '<(DEPTH)/media/video/picture.h',
3368 # '<(DEPTH)/media/video/video_decode_accelerator.cc',
3369 # '<(DEPTH)/media/video/video_decode_accelerator.h',
3370 # '<(DEPTH)/ui/gfx/size.cc',
3371 # '<(DEPTH)/ui/gfx/size.h',
3372 # ],
3373 # },
3368 { 3374 {
3369 'target_name': 'plugin_tests', 3375 'target_name': 'plugin_tests',
3370 'type': 'executable', 3376 'type': 'executable',
3371 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9', 3377 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9',
3372 'dependencies': [ 3378 'dependencies': [
3373 'chrome', 3379 'chrome',
3374 'chrome_resources', 3380 'chrome_resources',
3375 'chrome_strings', 3381 'chrome_strings',
3376 'test_support_common', 3382 'test_support_common',
3377 'test_support_ui', 3383 'test_support_ui',
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
3911 ] 3917 ]
3912 }], # 'coverage!=0' 3918 }], # 'coverage!=0'
3913 ], # 'conditions' 3919 ], # 'conditions'
3914 } 3920 }
3915 3921
3916 # Local Variables: 3922 # Local Variables:
3917 # tab-width:2 3923 # tab-width:2
3918 # indent-tabs-mode:nil 3924 # indent-tabs-mode:nil
3919 # End: 3925 # End:
3920 # vim: set expandtab tabstop=2 shiftwidth=2: 3926 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper_platform_video_decoder_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698