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

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

Issue 10837325: Make each NaCl glibc test copy its shared libraries into a unique directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | native_client_sdk/src/tools/create_nmf.py » ('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
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 # NOTE: There is no explicit dependency for the lib32 115 # NOTE: There is no explicit dependency for the lib32
116 # and lib64 directories created in the PRODUCT_DIR. 116 # and lib64 directories created in the PRODUCT_DIR.
117 # They are created as a side-effect of NMF creation. 117 # They are created as a side-effect of NMF creation.
118 'outputs': ['>(nmf_glibc)'], 118 'outputs': ['>(nmf_glibc)'],
119 'action': [ 119 'action': [
120 'python', 120 'python',
121 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', 121 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
122 '>@(_inputs)', 122 '>@(_inputs)',
123 '--objdump=>(nacl_objdump)', 123 '--objdump=>(nacl_objdump)',
124 '--output=>(nmf_glibc)', 124 '--output=>(nmf_glibc)',
125 '--path-prefix=>(nexe_target)_libs',
125 '--stage-dependencies=<(nacl_glibc_out_dir)', 126 '--stage-dependencies=<(nacl_glibc_out_dir)',
126 '--toolchain=glibc', 127 '--toolchain=glibc',
127 ], 128 ],
128 'target_conditions': [ 129 'target_conditions': [
129 ['enable_x86_64==1', { 130 ['enable_x86_64==1', {
130 'inputs': ['>(out_glibc64)'], 131 'inputs': ['>(out_glibc64)'],
131 'action': ['--library-path=>(libdir_glibc64)'], 132 'action': ['--library-path=>(libdir_glibc64)'],
132 }], 133 }],
133 ['enable_x86_32==1', { 134 ['enable_x86_32==1', {
134 'inputs': ['>(out_glibc32)'], 135 'inputs': ['>(out_glibc32)'],
135 'action': ['--library-path=>(libdir_glibc32)'], 136 'action': ['--library-path=>(libdir_glibc32)'],
136 }], 137 }],
137 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. 138 # TODO(ncbray) handle arm case. We don't have ARM glibc yet.
138 ], 139 ],
139 }, 140 },
140 ], 141 ],
141 }], 142 }],
142 ], 143 ],
143 }], 144 }],
144 ], 145 ],
145 }, 146 },
146 } 147 }
OLDNEW
« no previous file with comments | « no previous file | native_client_sdk/src/tools/create_nmf.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698