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

Side by Side Diff: chrome/test/data/nacl/nacl_browser_test.gypi

Issue 10958026: Port ppapi_ppb_core nacl_integration test to browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix dependancies. Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/data/nacl/DEPS ('k') | chrome/test/data/nacl/nacl_test_data.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 { 5 {
6 'includes': [ 6 'includes': [
7 '../../../../native_client/build/untrusted.gypi', 7 '../../../../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 # We need to override the variables in untrusted.gypi outside of a 10 # We need to override the variables in untrusted.gypi outside of a
11 # target_condition block because the target_condition block in 11 # target_condition block because the target_condition block in
12 # untrusted gypi is fully evaluated and interpolated before any of the 12 # untrusted gypi is fully evaluated and interpolated before any of the
13 # target_condition blocks in this file are expanded. This means that any 13 # target_condition blocks in this file are expanded. This means that any
14 # variables overriden inside a target_condition block in this file will not 14 # variables overriden inside a target_condition block in this file will not
15 # affect the values in untrusted.gypi. 15 # affect the values in untrusted.gypi.
16 'variables': { 16 'variables': {
17 'test_files': [], 17 'test_files': [],
18 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/newlib', 18 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/newlib',
19 'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe' ,
20 'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe' ,
21 'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe',
22 'nmf_newlib': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
23 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/nacl_test_data/glibc', 19 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/nacl_test_data/glibc',
24 'out_glibc32': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe', 20 'target_conditions': [
25 'out_glibc64': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe', 21 ['nexe_target!=""', {
26 'out_glibc_arm': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe', 22 # These variables are used for nexe building and for library building,
27 'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf', 23 # so they should be unconditionally re-defined.
24 'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.n exe',
25 'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.n exe',
26 'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.ne xe',
27 'nmf_newlib': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
28 'out_glibc32': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe ',
29 'out_glibc64': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe ',
30 'out_glibc_arm': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe' ,
31 'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
32 }],
33 ],
28 }, 34 },
29 'dependencies': [ 35 'dependencies': [
30 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', 36 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
31 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', 37 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
32 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 38 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
33 ], 39 ],
34 'target_conditions': [ 40 'target_conditions': [
35 ['test_files!=[] and build_newlib==1', { 41 ['test_files!=[] and build_newlib==1', {
36 'copies': [ 42 'copies': [
37 { 43 {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. 151 # TODO(ncbray) handle arm case. We don't have ARM glibc yet.
146 ], 152 ],
147 }, 153 },
148 ], 154 ],
149 }], 155 }],
150 ], 156 ],
151 }], 157 }],
152 ], 158 ],
153 }, 159 },
154 } 160 }
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/DEPS ('k') | chrome/test/data/nacl/nacl_test_data.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698