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

Side by Side Diff: content/content_tests.gypi

Issue 940903002: video_decode_accelerator_unittest: enable test on ozone surfaceless (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix remaining thumbnail issues Created 5 years, 10 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 '../ui/gfx/gfx.gyp:gfx_test_support', 1569 '../ui/gfx/gfx.gyp:gfx_test_support',
1570 '../ui/gfx/gfx.gyp:gfx_geometry', 1570 '../ui/gfx/gfx.gyp:gfx_geometry',
1571 '../ui/gl/gl.gyp:gl', 1571 '../ui/gl/gl.gyp:gl',
1572 'content.gyp:content', 1572 'content.gyp:content',
1573 ], 1573 ],
1574 'include_dirs': [ 1574 'include_dirs': [
1575 '<(DEPTH)/third_party/khronos', 1575 '<(DEPTH)/third_party/khronos',
1576 ], 1576 ],
1577 'sources': [ 1577 'sources': [
1578 'common/gpu/media/android_video_decode_accelerator_unittest.cc', 1578 'common/gpu/media/android_video_decode_accelerator_unittest.cc',
1579 'common/gpu/media/gl_renderer.cc',
1580 'common/gpu/media/gl_renderer.h',
1579 'common/gpu/media/rendering_helper.cc', 1581 'common/gpu/media/rendering_helper.cc',
1580 'common/gpu/media/rendering_helper.h', 1582 'common/gpu/media/rendering_helper.h',
1581 'common/gpu/media/video_accelerator_unittest_helpers.h', 1583 'common/gpu/media/video_accelerator_unittest_helpers.h',
1582 'common/gpu/media/video_decode_accelerator_unittest.cc', 1584 'common/gpu/media/video_decode_accelerator_unittest.cc',
1583 ], 1585 ],
1584 'conditions': [ 1586 'conditions': [
1585 ['OS=="android"', { 1587 ['OS=="android"', {
1586 'sources/': [ 1588 'sources/': [
1587 ['exclude', '^common/gpu/media/rendering_helper.h'], 1589 ['exclude', '^common/gpu/media/rendering_helper.h'],
1588 ['exclude', '^common/gpu/media/rendering_helper.cc'], 1590 ['exclude', '^common/gpu/media/rendering_helper.cc'],
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 'dependencies': [ 1623 'dependencies': [
1622 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c 1624 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c
1623 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 1625 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
1624 ], 1626 ],
1625 }], 1627 }],
1626 ['use_ozone==1 and chromeos==1', { 1628 ['use_ozone==1 and chromeos==1', {
1627 'dependencies': [ 1629 'dependencies': [
1628 '../ui/display/display.gyp:display', # Used by rendering_helpe r.cc 1630 '../ui/display/display.gyp:display', # Used by rendering_helpe r.cc
1629 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helpe r.cc 1631 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helpe r.cc
1630 ], 1632 ],
1633 'sources': [
1634 'common/gpu/media/surfaceless_gl_renderer.cc',
1635 'common/gpu/media/surfaceless_gl_renderer.h',
1636 ],
1631 }], 1637 }],
1632 ], 1638 ],
1633 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1639 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1634 'msvs_disabled_warnings': [ 4267, ], 1640 'msvs_disabled_warnings': [ 4267, ],
1635 }, 1641 },
1636 ] 1642 ]
1637 }], 1643 }],
1638 ['chromeos==1 and target_arch != "arm"', { 1644 ['chromeos==1 and target_arch != "arm"', {
1639 'targets': [ 1645 'targets': [
1640 { 1646 {
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
2143 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 2149 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
2144 }, 2150 },
2145 ], 2151 ],
2146 }], 2152 }],
2147 ], 2153 ],
2148 }, 2154 },
2149 ], 2155 ],
2150 }], 2156 }],
2151 ], 2157 ],
2152 } 2158 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698