| 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)/chrome/test/gpu', |
| 9 'src_dir': '../../..', | 9 'src_dir': '../../..', |
| 10 }, | 10 }, |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 ['toolkit_views==1', { | 95 ['toolkit_views==1', { |
| 96 'dependencies': [ | 96 'dependencies': [ |
| 97 '<(src_dir)/ui/views/views.gyp:views', | 97 '<(src_dir)/ui/views/views.gyp:views', |
| 98 ], | 98 ], |
| 99 }], | 99 }], |
| 100 ['OS=="android"', { | 100 ['OS=="android"', { |
| 101 'dependencies!': [ | 101 'dependencies!': [ |
| 102 'chrome', | 102 'chrome', |
| 103 ], | 103 ], |
| 104 'dependencies': [ | 104 'dependencies': [ |
| 105 '<@(chromium_dependencies)', | 105 '<@(chromium_browser_dependencies)', |
| 106 '<@(chromium_child_dependencies)', |
| 106 'chrome_resources.gyp:packed_resources', | 107 'chrome_resources.gyp:packed_resources', |
| 107 'chrome_resources.gyp:packed_extra_resources', | 108 'chrome_resources.gyp:packed_extra_resources', |
| 108 ], | 109 ], |
| 109 }], | 110 }], |
| 110 ], | 111 ], |
| 111 } | 112 } |
| OLD | NEW |