| 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 }, |
| 11 'defines': [ | 11 'defines': [ |
| 12 'HAS_OUT_OF_PROC_TEST_RUNNER', | 12 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 13 ], | 13 ], |
| 14 'include_dirs': [ | 14 'include_dirs': [ |
| 15 '<(src_dir)', | 15 '<(src_dir)', |
| 16 '<(test_list_out_dir)', | 16 '<(test_list_out_dir)', |
| 17 ], | 17 ], |
| 18 # hard_dependency is necessary for this target because it has actions | 18 # hard_dependency is necessary for this target because it has actions |
| 19 # that generate a header file included by dependent targets. The header | 19 # that generate a header file included by dependent targets. The header |
| 20 # file must be generated before the dependents are compiled. The usual | 20 # file must be generated before the dependents are compiled. The usual |
| 21 # semantics are to allow the two targets to build concurrently. | 21 # semantics are to allow the two targets to build concurrently. |
| 22 'hard_dependency': 1, | 22 'hard_dependency': 1, |
| 23 'conditions': [ | 23 'conditions': [ |
| 24 ['OS=="win"', { | 24 ['OS=="win"', { |
| 25 'include_dirs': [ | 25 'include_dirs': [ |
| 26 '<(DEPTH)/third_party/wtl/include', | 26 '<(DEPTH)/third_party/wtl/include', |
| 27 ], | 27 ], |
| 28 'sources': [ | |
| 29 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', | |
| 30 ], | |
| 31 'conditions': [ | 28 'conditions': [ |
| 32 ['win_use_allocator_shim==1', { | 29 ['win_use_allocator_shim==1', { |
| 33 'dependencies': [ | 30 'dependencies': [ |
| 34 '../base/allocator/allocator.gyp:allocator', | 31 '../base/allocator/allocator.gyp:allocator', |
| 35 ], | 32 ], |
| 36 }], | 33 }], |
| 37 ], | 34 ], |
| 38 'configurations': { | 35 'configurations': { |
| 39 'Debug': { | 36 'Debug': { |
| 40 'msvs_settings': { | 37 'msvs_settings': { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 54 '<(src_dir)/build/linux/system.gyp:ssl', | 51 '<(src_dir)/build/linux/system.gyp:ssl', |
| 55 ], | 52 ], |
| 56 }], | 53 }], |
| 57 ['toolkit_views==1', { | 54 ['toolkit_views==1', { |
| 58 'dependencies': [ | 55 'dependencies': [ |
| 59 '<(src_dir)/ui/views/views.gyp:views', | 56 '<(src_dir)/ui/views/views.gyp:views', |
| 60 ], | 57 ], |
| 61 }], | 58 }], |
| 62 ], | 59 ], |
| 63 } | 60 } |
| OLD | NEW |