Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1355 ], | 1355 ], |
| 1356 'include_dirs': [ | 1356 'include_dirs': [ |
| 1357 '..', | 1357 '..', |
| 1358 ], | 1358 ], |
| 1359 'sources': [ | 1359 'sources': [ |
| 1360 'common/gpu/client/gl_helper_benchmark.cc', | 1360 'common/gpu/client/gl_helper_benchmark.cc', |
| 1361 ], | 1361 ], |
| 1362 }, | 1362 }, |
| 1363 ], | 1363 ], |
| 1364 }], | 1364 }], |
| 1365 ['chromeos==1 or OS=="win" or OS=="android"', { | 1365 ['(chromeos==1 or (OS=="linux" and use_x11==1 and target_arch != "arm")) or OS=="win" or OS=="android"', { |
|
danakj
2014/06/19 15:56:26
and this?
| |
| 1366 'targets': [ | 1366 'targets': [ |
| 1367 { | 1367 { |
| 1368 'target_name': 'video_decode_accelerator_unittest', | 1368 'target_name': 'video_decode_accelerator_unittest', |
| 1369 'type': '<(gtest_target_type)', | 1369 'type': '<(gtest_target_type)', |
| 1370 'dependencies': [ | 1370 'dependencies': [ |
| 1371 'test_support_content', | |
| 1371 '../base/base.gyp:base', | 1372 '../base/base.gyp:base', |
| 1372 '../media/media.gyp:media', | 1373 '../media/media.gyp:media', |
| 1373 '../testing/gtest.gyp:gtest', | 1374 '../testing/gtest.gyp:gtest', |
| 1374 '../ui/base/ui_base.gyp:ui_base', | 1375 '../ui/base/ui_base.gyp:ui_base', |
| 1375 '../ui/gfx/gfx.gyp:gfx', | 1376 '../ui/gfx/gfx.gyp:gfx', |
| 1376 '../ui/gfx/gfx.gyp:gfx_geometry', | 1377 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 1377 '../ui/gl/gl.gyp:gl', | 1378 '../ui/gl/gl.gyp:gl', |
| 1378 'content.gyp:content', | 1379 'content.gyp:content', |
| 1379 ], | 1380 ], |
| 1380 'include_dirs': [ | 1381 'include_dirs': [ |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1428 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c | 1429 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c |
| 1429 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', | 1430 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', |
| 1430 ], | 1431 ], |
| 1431 }], | 1432 }], |
| 1432 ], | 1433 ], |
| 1433 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1434 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 1434 'msvs_disabled_warnings': [ 4267, ], | 1435 'msvs_disabled_warnings': [ 4267, ], |
| 1435 }, | 1436 }, |
| 1436 ] | 1437 ] |
| 1437 }], | 1438 }], |
| 1438 ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', { | 1439 ['(chromeos==1 or OS=="linux") and use_x11==1 and target_arch != "arm"', { |
| 1439 'targets': [ | 1440 'targets': [ |
| 1440 { | 1441 { |
| 1441 'target_name': 'vaapi_h264_decoder_unittest', | 1442 'target_name': 'vaapi_h264_decoder_unittest', |
| 1442 'type': '<(gtest_target_type)', | 1443 'type': '<(gtest_target_type)', |
| 1443 'dependencies': [ | 1444 'dependencies': [ |
| 1444 'content.gyp:content_common', | 1445 'content.gyp:content_common', |
| 1446 'test_support_content', | |
| 1445 '../base/base.gyp:base', | 1447 '../base/base.gyp:base', |
| 1446 '../build/linux/system.gyp:x11', | 1448 '../build/linux/system.gyp:x11', |
| 1447 '../media/media.gyp:media', | 1449 '../media/media.gyp:media', |
| 1448 '../testing/gtest.gyp:gtest', | 1450 '../testing/gtest.gyp:gtest', |
| 1449 '../third_party/libyuv/libyuv.gyp:libyuv', | 1451 '../third_party/libyuv/libyuv.gyp:libyuv', |
| 1450 '../ui/gfx/gfx.gyp:gfx_geometry', | 1452 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 1451 ], | 1453 ], |
| 1452 'sources': [ | 1454 'sources': [ |
| 1453 'common/gpu/media/vaapi_h264_decoder_unittest.cc', | 1455 'common/gpu/media/vaapi_h264_decoder_unittest.cc', |
| 1454 ], | 1456 ], |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1813 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1815 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1814 }, | 1816 }, |
| 1815 ], | 1817 ], |
| 1816 }], | 1818 }], |
| 1817 ], | 1819 ], |
| 1818 }, | 1820 }, |
| 1819 ], | 1821 ], |
| 1820 }], | 1822 }], |
| 1821 ], | 1823 ], |
| 1822 } | 1824 } |
| OLD | NEW |