| 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 # the application embedder is using. | 115 # the application embedder is using. |
| 116 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], | 116 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], |
| 117 }], | 117 }], |
| 118 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 118 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 119 'dependencies': [ | 119 'dependencies': [ |
| 120 '<(DEPTH)/components/nacl.gyp:nacl_helper', | 120 '<(DEPTH)/components/nacl.gyp:nacl_helper', |
| 121 '<(DEPTH)/components/nacl_nonsfi.gyp:nacl_helper_nonsfi', | 121 '<(DEPTH)/components/nacl_nonsfi.gyp:nacl_helper_nonsfi', |
| 122 '<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_boots
trap.gyp:nacl_helper_bootstrap', | 122 '<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_boots
trap.gyp:nacl_helper_bootstrap', |
| 123 ], | 123 ], |
| 124 }], | 124 }], |
| 125 ['OS=="win" and win_use_allocator_shim==1', { |
| 126 'dependencies': [ |
| 127 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| 128 ], |
| 129 }], |
| 125 ], | 130 ], |
| 126 'defines': [ | 131 'defines': [ |
| 127 'HAS_OUT_OF_PROC_TEST_RUNNER', | 132 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 128 ], | 133 ], |
| 129 'include_dirs': [ | 134 'include_dirs': [ |
| 130 '<(DEPTH)', | 135 '<(DEPTH)', |
| 131 '<(SHARED_INTERMEDIATE_DIR)', | 136 '<(SHARED_INTERMEDIATE_DIR)', |
| 132 ], | 137 ], |
| 133 'rules': [ | 138 'rules': [ |
| 134 { | 139 { |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 '<@(js_files)', | 289 '<@(js_files)', |
| 285 ], | 290 ], |
| 286 }, | 291 }, |
| 287 ], | 292 ], |
| 288 'dependencies': [ | 293 'dependencies': [ |
| 289 'chromevox_test_messages_js', | 294 'chromevox_test_messages_js', |
| 290 ], | 295 ], |
| 291 }, # target chromevox_test_deps_js | 296 }, # target chromevox_test_deps_js |
| 292 ], | 297 ], |
| 293 } | 298 } |
| OLD | NEW |