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

Side by Side Diff: content/content_tests.gypi

Issue 356903002: Revert "Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « content/content_common.gypi ('k') | content/public/common/content_switches.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) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'layouttest_support_content', 8 'target_name': 'layouttest_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'conditions': [ 10 'conditions': [
(...skipping 1449 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 ], 1460 ],
1461 'sources': [ 1461 'sources': [
1462 'common/gpu/media/vaapi_h264_decoder_unittest.cc', 1462 'common/gpu/media/vaapi_h264_decoder_unittest.cc',
1463 ], 1463 ],
1464 'include_dirs': [ 1464 'include_dirs': [
1465 '<(DEPTH)/third_party/libva', 1465 '<(DEPTH)/third_party/libva',
1466 ], 1466 ],
1467 }, 1467 },
1468 ] 1468 ]
1469 }], 1469 }],
1470 ['chromeos==1 and target_arch == "arm"', { 1470 ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', {
1471 'targets': [ 1471 'targets': [
1472 { 1472 {
1473 'target_name': 'video_encode_accelerator_unittest', 1473 'target_name': 'video_encode_accelerator_unittest',
1474 'type': 'executable', 1474 'type': 'executable',
1475 'dependencies': [ 1475 'dependencies': [
1476 '../base/base.gyp:base', 1476 '../base/base.gyp:base',
1477 '../media/media.gyp:media', 1477 '../media/media.gyp:media',
1478 '../media/media.gyp:media_test_support', 1478 '../media/media.gyp:media_test_support',
1479 '../testing/gtest.gyp:gtest', 1479 '../testing/gtest.gyp:gtest',
1480 '../ui/base/ui_base.gyp:ui_base', 1480 '../ui/base/ui_base.gyp:ui_base',
1481 '../ui/gfx/gfx.gyp:gfx', 1481 '../ui/gfx/gfx.gyp:gfx',
1482 '../ui/gfx/gfx.gyp:gfx_geometry', 1482 '../ui/gfx/gfx.gyp:gfx_geometry',
1483 '../ui/gl/gl.gyp:gl', 1483 '../ui/gl/gl.gyp:gl',
1484 'content.gyp:content', 1484 'content.gyp:content',
1485 ], 1485 ],
1486 'sources': [ 1486 'sources': [
1487 'common/gpu/media/video_accelerator_unittest_helpers.h', 1487 'common/gpu/media/video_accelerator_unittest_helpers.h',
1488 'common/gpu/media/video_encode_accelerator_unittest.cc', 1488 'common/gpu/media/video_encode_accelerator_unittest.cc',
1489 ], 1489 ],
1490 'include_dirs': [
1491 '<(DEPTH)/third_party/libva',
1492 '<(DEPTH)/third_party/libyuv',
1493 ],
1494 'conditions': [
1495 ['use_x11==1', {
1496 'dependencies': [
1497 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
1498 ],
1499 }],
1500 ],
1490 }, 1501 },
1491 ] 1502 ]
1492 }], 1503 }],
1493 ['OS == "android"', { 1504 ['OS == "android"', {
1494 'targets': [ 1505 'targets': [
1495 { 1506 {
1496 'target_name': 'content_gl_tests_apk', 1507 'target_name': 'content_gl_tests_apk',
1497 'type': 'none', 1508 'type': 'none',
1498 'dependencies': [ 1509 'dependencies': [
1499 'content_gl_tests', 1510 'content_gl_tests',
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1822 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1833 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1823 }, 1834 },
1824 ], 1835 ],
1825 }], 1836 }],
1826 ], 1837 ],
1827 }, 1838 },
1828 ], 1839 ],
1829 }], 1840 }],
1830 ], 1841 ],
1831 } 1842 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698