| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'includes': [ | 6 'includes': [ |
| 7 '../../../../js_unittest_vars.gypi', | 7 '../../../../js_unittest_vars.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'chromevox_test_deps_js_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/re
sources/chromeos/chromevox/test_deps.js', | 10 'chromevox_test_deps_js_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/re
sources/chromeos/chromevox/test_deps.js', |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 # the application embedder is using. | 118 # the application embedder is using. |
| 119 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], | 119 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], |
| 120 }], | 120 }], |
| 121 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 121 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 122 'dependencies': [ | 122 'dependencies': [ |
| 123 '<(DEPTH)/components/nacl.gyp:nacl_helper', | 123 '<(DEPTH)/components/nacl.gyp:nacl_helper', |
| 124 '<(DEPTH)/components/nacl_nonsfi.gyp:nacl_helper_nonsfi', | 124 '<(DEPTH)/components/nacl_nonsfi.gyp:nacl_helper_nonsfi', |
| 125 '<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_boots
trap.gyp:nacl_helper_bootstrap', | 125 '<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_boots
trap.gyp:nacl_helper_bootstrap', |
| 126 ], | 126 ], |
| 127 }], | 127 }], |
| 128 ['OS=="win" and win_use_allocator_shim==1', { | |
| 129 'dependencies': [ | |
| 130 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | |
| 131 ], | |
| 132 }], | |
| 133 ], | 128 ], |
| 134 'defines': [ | 129 'defines': [ |
| 135 'HAS_OUT_OF_PROC_TEST_RUNNER', | 130 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 136 ], | 131 ], |
| 137 'include_dirs': [ | 132 'include_dirs': [ |
| 138 '<(DEPTH)', | 133 '<(DEPTH)', |
| 139 '<(SHARED_INTERMEDIATE_DIR)', | 134 '<(SHARED_INTERMEDIATE_DIR)', |
| 140 ], | 135 ], |
| 141 'rules': [ | 136 'rules': [ |
| 142 { | 137 { |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 '<@(js_files)', | 287 '<@(js_files)', |
| 293 ], | 288 ], |
| 294 }, | 289 }, |
| 295 ], | 290 ], |
| 296 'dependencies': [ | 291 'dependencies': [ |
| 297 'chromevox_test_messages_js', | 292 'chromevox_test_messages_js', |
| 298 ], | 293 ], |
| 299 }, # target chromevox_test_deps_js | 294 }, # target chromevox_test_deps_js |
| 300 ], | 295 ], |
| 301 } | 296 } |
| OLD | NEW |