| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # This file is meant to be included into targets which run gpu tests. | 5 # This file is meant to be included into targets which run gpu tests. |
| 6 { | 6 { |
| 7 'variables': { | 7 'variables': { |
| 8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu', | 8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu', |
| 9 'src_dir': '../../..', | 9 'src_dir': '../../..', |
| 10 }, | 10 }, |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 44 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 45 }, | 45 }, |
| 46 }, | 46 }, |
| 47 }, | 47 }, |
| 48 }, | 48 }, |
| 49 }], | 49 }], |
| 50 ['OS=="mac"', { | 50 ['OS=="mac"', { |
| 51 # See comments about "xcode_settings" elsewhere in this file. | 51 # See comments about "xcode_settings" elsewhere in this file. |
| 52 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 52 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 53 }], | 53 }], |
| 54 ['toolkit_uses_gtk == 1', { | |
| 55 'dependencies': [ | |
| 56 '<(src_dir)/build/linux/system.gyp:gtk', | |
| 57 ], | |
| 58 }], | |
| 59 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', { | 54 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', { |
| 60 'dependencies': [ | 55 'dependencies': [ |
| 61 '<(src_dir)/build/linux/system.gyp:ssl', | 56 '<(src_dir)/build/linux/system.gyp:ssl', |
| 62 ], | 57 ], |
| 63 }], | 58 }], |
| 64 ['toolkit_views==1', { | 59 ['toolkit_views==1', { |
| 65 'dependencies': [ | 60 'dependencies': [ |
| 66 '<(src_dir)/ui/views/views.gyp:views', | 61 '<(src_dir)/ui/views/views.gyp:views', |
| 67 ], | 62 ], |
| 68 }], | 63 }], |
| 69 ], | 64 ], |
| 70 } | 65 } |
| OLD | NEW |