| 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)/chrome/test/gpu', |    8      'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu', | 
|    9      'src_dir': '../../..', |    9      'src_dir': '../../..', | 
|   10   }, |   10   }, | 
|   11   'dependencies': [ |  | 
|   12     'browser', |  | 
|   13     'chrome', |  | 
|   14     'chrome_resources.gyp:chrome_resources', |  | 
|   15     'chrome_resources.gyp:chrome_strings', |  | 
|   16     'renderer', |  | 
|   17     'test_support_common', |  | 
|   18     'test_support_ui', |  | 
|   19     '<(src_dir)/base/base.gyp:base', |  | 
|   20     '<(src_dir)/base/base.gyp:test_support_base', |  | 
|   21     '<(src_dir)/net/net.gyp:net_test_support', |  | 
|   22     '<(src_dir)/skia/skia.gyp:skia', |  | 
|   23     '<(src_dir)/testing/gmock.gyp:gmock', |  | 
|   24     '<(src_dir)/testing/gtest.gyp:gtest', |  | 
|   25     '<(src_dir)/third_party/icu/icu.gyp:icui18n', |  | 
|   26     '<(src_dir)/third_party/icu/icu.gyp:icuuc', |  | 
|   27   ], |  | 
|   28   'defines': [ |   11   'defines': [ | 
|   29     'HAS_OUT_OF_PROC_TEST_RUNNER', |   12     'HAS_OUT_OF_PROC_TEST_RUNNER', | 
|   30   ], |   13   ], | 
|   31   'include_dirs': [ |   14   'include_dirs': [ | 
|   32     '<(src_dir)', |   15     '<(src_dir)', | 
|   33     '<(test_list_out_dir)', |   16     '<(test_list_out_dir)', | 
|   34   ], |   17   ], | 
|   35   'sources': [ |  | 
|   36     '<(src_dir)/chrome/test/base/chrome_test_launcher.cc', |  | 
|   37   ], |  | 
|   38   # hard_dependency is necessary for this target because it has actions |   18   # hard_dependency is necessary for this target because it has actions | 
|   39   # that generate a header file included by dependent targets. The header |   19   # that generate a header file included by dependent targets. The header | 
|   40   # file must be generated before the dependents are compiled. The usual |   20   # file must be generated before the dependents are compiled. The usual | 
|   41   # semantics are to allow the two targets to build concurrently. |   21   # semantics are to allow the two targets to build concurrently. | 
|   42   'hard_dependency': 1, |   22   'hard_dependency': 1, | 
|   43   'conditions': [ |   23   'conditions': [ | 
|   44     ['OS=="win"', { |   24     ['OS=="win"', { | 
|   45       'dependencies': [ |  | 
|   46         'chrome_version_resources', |  | 
|   47       ], |  | 
|   48       'include_dirs': [ |   25       'include_dirs': [ | 
|   49         '<(DEPTH)/third_party/wtl/include', |   26         '<(DEPTH)/third_party/wtl/include', | 
|   50       ], |   27       ], | 
|   51       'sources': [ |   28       'sources': [ | 
|   52         '<(src_dir)/chrome/app/chrome_dll.rc', |  | 
|   53         '<(src_dir)/chrome/app/chrome_dll_resource.h', |  | 
|   54         '<(src_dir)/chrome/app/chrome_version.rc.version', |  | 
|   55         '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |  | 
|   56         '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |  | 
|   57         '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |  | 
|   58         '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |  | 
|   59         '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |  | 
|   60         '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', |   29         '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', | 
|   61         '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |   30         '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 
|   62         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |   31         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 
|   63         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |   32         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 
|   64       ], |   33       ], | 
|   65       'conditions': [ |   34       'conditions': [ | 
|   66         ['win_use_allocator_shim==1', { |   35         ['win_use_allocator_shim==1', { | 
|   67           'dependencies': [ |   36           'dependencies': [ | 
|   68             '<(allocator_target)', |   37             '../base/allocator/allocator.gyp:allocator', | 
|   69           ], |   38           ], | 
|   70         }], |   39         }], | 
|   71       ], |   40       ], | 
|   72       'configurations': { |   41       'configurations': { | 
|   73         'Debug': { |   42         'Debug': { | 
|   74           'msvs_settings': { |   43           'msvs_settings': { | 
|   75             'VCLinkerTool': { |   44             'VCLinkerTool': { | 
|   76               'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |   45               'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 
|   77             }, |   46             }, | 
|   78           }, |   47           }, | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
|   91     ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', { |   60     ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', { | 
|   92       'dependencies': [ |   61       'dependencies': [ | 
|   93         '<(src_dir)/build/linux/system.gyp:ssl', |   62         '<(src_dir)/build/linux/system.gyp:ssl', | 
|   94       ], |   63       ], | 
|   95     }], |   64     }], | 
|   96     ['toolkit_views==1', { |   65     ['toolkit_views==1', { | 
|   97       'dependencies': [ |   66       'dependencies': [ | 
|   98        '<(src_dir)/ui/views/views.gyp:views', |   67        '<(src_dir)/ui/views/views.gyp:views', | 
|   99       ], |   68       ], | 
|  100     }], |   69     }], | 
|  101     ['OS=="android"', { |  | 
|  102       'dependencies!': [ |  | 
|  103         'chrome', |  | 
|  104       ], |  | 
|  105       'dependencies': [ |  | 
|  106         '<@(chromium_dependencies)', |  | 
|  107         'chrome_resources.gyp:packed_resources', |  | 
|  108         'chrome_resources.gyp:packed_extra_resources', |  | 
|  109       ], |  | 
|  110     }], |  | 
|  111   ], |   70   ], | 
|  112 } |   71 } | 
| OLD | NEW |