Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi

Issue 1200133002: Add nacl_helper dependencies to chromevox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 19 matching lines...) Expand all
30 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 30 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
31 'chromevox_test_deps_js', 31 'chromevox_test_deps_js',
32 ], 32 ],
33 'conditions': [ 33 'conditions': [
34 [ 'cld_version==0 or cld_version==2', { 34 [ 'cld_version==0 or cld_version==2', {
35 'dependencies': [ 35 'dependencies': [
36 # Interactive tests should use whatever CLD2 data access mode that 36 # Interactive tests should use whatever CLD2 data access mode that
37 # the application embedder is using. 37 # the application embedder is using.
38 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], 38 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
39 }], 39 }],
40 ['disable_nacl==0 and disable_nacl_untrusted==0', {
41 'dependencies': [
42 '<(DEPTH)/components/nacl.gyp:nacl_helper',
43 '<(DEPTH)/components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
44 '<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_boots trap.gyp:nacl_helper_bootstrap',
45 ],
46 }],
40 ], 47 ],
41 'defines': [ 48 'defines': [
42 'HAS_OUT_OF_PROC_TEST_RUNNER', 49 'HAS_OUT_OF_PROC_TEST_RUNNER',
43 ], 50 ],
44 'include_dirs': [ 51 'include_dirs': [
45 '<(DEPTH)', 52 '<(DEPTH)',
46 '<(SHARED_INTERMEDIATE_DIR)', 53 '<(SHARED_INTERMEDIATE_DIR)',
47 ], 54 ],
48 'rules': [ 55 'rules': [
49 { 56 {
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 '<@(js_files)', 265 '<@(js_files)',
259 ], 266 ],
260 }, 267 },
261 ], 268 ],
262 'dependencies': [ 269 'dependencies': [
263 'chromevox_test_messages_js', 270 'chromevox_test_messages_js',
264 ], 271 ],
265 }, # target chromevox_test_deps_js 272 }, # target chromevox_test_deps_js
266 ], 273 ],
267 } 274 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698