| 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 1446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1457 ], | 1457 ], |
| 1458 'sources': [ | 1458 'sources': [ |
| 1459 'common/gpu/media/vaapi_h264_decoder_unittest.cc', | 1459 'common/gpu/media/vaapi_h264_decoder_unittest.cc', |
| 1460 ], | 1460 ], |
| 1461 'include_dirs': [ | 1461 'include_dirs': [ |
| 1462 '<(DEPTH)/third_party/libva', | 1462 '<(DEPTH)/third_party/libva', |
| 1463 ], | 1463 ], |
| 1464 }, | 1464 }, |
| 1465 ] | 1465 ] |
| 1466 }], | 1466 }], |
| 1467 ['chromeos==1 and target_arch == "arm"', { | 1467 ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', { |
| 1468 'targets': [ | 1468 'targets': [ |
| 1469 { | 1469 { |
| 1470 'target_name': 'video_encode_accelerator_unittest', | 1470 'target_name': 'video_encode_accelerator_unittest', |
| 1471 'type': 'executable', | 1471 'type': 'executable', |
| 1472 'dependencies': [ | 1472 'dependencies': [ |
| 1473 '../base/base.gyp:base', | 1473 '../base/base.gyp:base', |
| 1474 '../media/media.gyp:media', | 1474 '../media/media.gyp:media', |
| 1475 '../media/media.gyp:media_test_support', | 1475 '../media/media.gyp:media_test_support', |
| 1476 '../testing/gtest.gyp:gtest', | 1476 '../testing/gtest.gyp:gtest', |
| 1477 '../ui/base/ui_base.gyp:ui_base', | 1477 '../ui/base/ui_base.gyp:ui_base', |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1819 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1819 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1820 }, | 1820 }, |
| 1821 ], | 1821 ], |
| 1822 }], | 1822 }], |
| 1823 ], | 1823 ], |
| 1824 }, | 1824 }, |
| 1825 ], | 1825 ], |
| 1826 }], | 1826 }], |
| 1827 ], | 1827 ], |
| 1828 } | 1828 } |
| OLD | NEW |