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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 6979017: Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/common/gpu/DEPS » ('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 3453 matching lines...) Expand 10 before | Expand all | Expand 10 after
3464 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.cc', 3464 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.cc',
3465 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.h', 3465 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.h',
3466 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator_tester.cc', 3466 # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator_tester.cc',
3467 # '<(DEPTH)/media/video/picture.cc', 3467 # '<(DEPTH)/media/video/picture.cc',
3468 # '<(DEPTH)/media/video/picture.h', 3468 # '<(DEPTH)/media/video/picture.h',
3469 # '<(DEPTH)/media/video/video_decode_accelerator.cc', 3469 # '<(DEPTH)/media/video/video_decode_accelerator.cc',
3470 # '<(DEPTH)/media/video/video_decode_accelerator.h', 3470 # '<(DEPTH)/media/video/video_decode_accelerator.h',
3471 # '<(DEPTH)/ui/gfx/size.cc', 3471 # '<(DEPTH)/ui/gfx/size.cc',
3472 # '<(DEPTH)/ui/gfx/size.h', 3472 # '<(DEPTH)/ui/gfx/size.h',
3473 # ], 3473 # ],
3474 # 'conditions': [
3475 # ['target_arch=="arm"', {
3476 # 'sources': [
3477 # '<(DEPTH)/content/gpu/gles2_texture_to_egl_image_translator.cc',
3478 # '<(DEPTH)/content/gpu/gles2_texture_to_egl_image_translator.h',
3479 # '<(DEPTH)/content/gpu/omx_video_decode_accelerator.cc',
3480 # '<(DEPTH)/content/gpu/omx_video_decode_accelerator.h',
3481 # ],
3482 # 'link_settings': {
3483 # 'libraries': [
3484 # '-lEGL',
3485 # '-lGLESv2',
3486 # ],
3487 # },
3488 # }],
3489 # ],
3474 # }, 3490 # },
3475 { 3491 {
3476 'target_name': 'plugin_tests', 3492 'target_name': 'plugin_tests',
3477 'type': 'executable', 3493 'type': 'executable',
3478 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9', 3494 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9',
3479 'dependencies': [ 3495 'dependencies': [
3480 'chrome', 3496 'chrome',
3481 'chrome_resources', 3497 'chrome_resources',
3482 'chrome_strings', 3498 'chrome_strings',
3483 'test_support_common', 3499 'test_support_common',
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
4018 ] 4034 ]
4019 }], # 'coverage!=0' 4035 }], # 'coverage!=0'
4020 ], # 'conditions' 4036 ], # 'conditions'
4021 } 4037 }
4022 4038
4023 # Local Variables: 4039 # Local Variables:
4024 # tab-width:2 4040 # tab-width:2
4025 # indent-tabs-mode:nil 4041 # indent-tabs-mode:nil
4026 # End: 4042 # End:
4027 # vim: set expandtab tabstop=2 shiftwidth=2: 4043 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698