| 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 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1451 ], | 1451 ], |
| 1452 'sources': [ | 1452 'sources': [ |
| 1453 'common/gpu/media/vaapi_h264_decoder_unittest.cc', | 1453 'common/gpu/media/vaapi_h264_decoder_unittest.cc', |
| 1454 ], | 1454 ], |
| 1455 'include_dirs': [ | 1455 'include_dirs': [ |
| 1456 '<(DEPTH)/third_party/libva', | 1456 '<(DEPTH)/third_party/libva', |
| 1457 ], | 1457 ], |
| 1458 }, | 1458 }, |
| 1459 ] | 1459 ] |
| 1460 }], | 1460 }], |
| 1461 ['chromeos==1 and target_arch == "arm"', { | 1461 ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', { |
| 1462 'targets': [ | 1462 'targets': [ |
| 1463 { | 1463 { |
| 1464 'target_name': 'video_encode_accelerator_unittest', | 1464 'target_name': 'video_encode_accelerator_unittest', |
| 1465 'type': 'executable', | 1465 'type': 'executable', |
| 1466 'dependencies': [ | 1466 'dependencies': [ |
| 1467 '../base/base.gyp:base', | 1467 '../base/base.gyp:base', |
| 1468 '../media/media.gyp:media', | 1468 '../media/media.gyp:media', |
| 1469 '../media/media.gyp:media_test_support', | 1469 '../media/media.gyp:media_test_support', |
| 1470 '../testing/gtest.gyp:gtest', | 1470 '../testing/gtest.gyp:gtest', |
| 1471 '../ui/base/ui_base.gyp:ui_base', | 1471 '../ui/base/ui_base.gyp:ui_base', |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1813 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1813 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1814 }, | 1814 }, |
| 1815 ], | 1815 ], |
| 1816 }], | 1816 }], |
| 1817 ], | 1817 ], |
| 1818 }, | 1818 }, |
| 1819 ], | 1819 ], |
| 1820 }], | 1820 }], |
| 1821 ], | 1821 ], |
| 1822 } | 1822 } |
| OLD | NEW |