| 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 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1393 ], | 1393 ], |
| 1394 }], | 1394 }], |
| 1395 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { | 1395 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { |
| 1396 'include_dirs': [ | 1396 'include_dirs': [ |
| 1397 '<(DEPTH)/third_party/libva', | 1397 '<(DEPTH)/third_party/libva', |
| 1398 ], | 1398 ], |
| 1399 }], | 1399 }], |
| 1400 ['use_x11==1', { | 1400 ['use_x11==1', { |
| 1401 'dependencies': [ | 1401 'dependencies': [ |
| 1402 '../build/linux/system.gyp:x11', # Used by rendering_helper.c
c | 1402 '../build/linux/system.gyp:x11', # Used by rendering_helper.c
c |
| 1403 '../ui/gfx/gfx.gyp:gfx_x11', | |
| 1404 ], | 1403 ], |
| 1405 }], | 1404 }], |
| 1406 ], | 1405 ], |
| 1407 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1406 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 1408 'msvs_disabled_warnings': [ 4267, ], | 1407 'msvs_disabled_warnings': [ 4267, ], |
| 1409 }, | 1408 }, |
| 1410 ] | 1409 ] |
| 1411 }], | 1410 }], |
| 1412 ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', { | 1411 ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', { |
| 1413 'targets': [ | 1412 'targets': [ |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1791 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1790 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1792 }, | 1791 }, |
| 1793 ], | 1792 ], |
| 1794 }], | 1793 }], |
| 1795 ], | 1794 ], |
| 1796 }, | 1795 }, |
| 1797 ], | 1796 ], |
| 1798 }], | 1797 }], |
| 1799 ], | 1798 ], |
| 1800 } | 1799 } |
| OLD | NEW |