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

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

Issue 11316289: Fix create_nmf warnings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | ppapi/ppapi_untrusted.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
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 # exist. However, VS 2010 seems to blackhole this entire target if 84 # exist. However, VS 2010 seems to blackhole this entire target if
85 # there are no inputs to this action. To work around this we ad d a 85 # there are no inputs to this action. To work around this we ad d a
86 # bogus input. 86 # bogus input.
87 'inputs': [], 87 'inputs': [],
88 'outputs': ['>(nmf_newlib)'], 88 'outputs': ['>(nmf_newlib)'],
89 'action': [ 89 'action': [
90 'python', 90 'python',
91 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', 91 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
92 '>@(_inputs)', 92 '>@(_inputs)',
93 '--output=>(nmf_newlib)', 93 '--output=>(nmf_newlib)',
94 '--toolchain=newlib',
95 ], 94 ],
96 'target_conditions': [ 95 'target_conditions': [
97 ['enable_x86_64==1', { 96 ['enable_x86_64==1', {
98 'inputs': ['>(out_newlib64)'], 97 'inputs': ['>(out_newlib64)'],
99 }], 98 }],
100 ['enable_x86_32==1', { 99 ['enable_x86_32==1', {
101 'inputs': ['>(out_newlib32)'], 100 'inputs': ['>(out_newlib32)'],
102 }], 101 }],
103 ['enable_arm==1', { 102 ['enable_arm==1', {
104 'inputs': ['>(out_newlib_arm)'], 103 'inputs': ['>(out_newlib_arm)'],
(...skipping 19 matching lines...) Expand all
124 # They are created as a side-effect of NMF creation. 123 # They are created as a side-effect of NMF creation.
125 'outputs': ['>(nmf_glibc)'], 124 'outputs': ['>(nmf_glibc)'],
126 'action': [ 125 'action': [
127 'python', 126 'python',
128 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', 127 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
129 '>@(_inputs)', 128 '>@(_inputs)',
130 '--objdump=>(nacl_objdump)', 129 '--objdump=>(nacl_objdump)',
131 '--output=>(nmf_glibc)', 130 '--output=>(nmf_glibc)',
132 '--path-prefix=>(nexe_target)_libs', 131 '--path-prefix=>(nexe_target)_libs',
133 '--stage-dependencies=<(nacl_glibc_out_dir)', 132 '--stage-dependencies=<(nacl_glibc_out_dir)',
134 '--toolchain=glibc',
135 ], 133 ],
136 'target_conditions': [ 134 'target_conditions': [
137 ['enable_x86_64==1', { 135 ['enable_x86_64==1', {
138 'inputs': ['>(out_glibc64)'], 136 'inputs': ['>(out_glibc64)'],
139 'action': [ 137 'action': [
140 '--library-path=>(libdir_glibc64)', 138 '--library-path=>(libdir_glibc64)',
141 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64' , 139 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64' ,
142 ], 140 ],
143 }], 141 }],
144 ['enable_x86_32==1', { 142 ['enable_x86_32==1', {
145 'inputs': ['>(out_glibc32)'], 143 'inputs': ['>(out_glibc32)'],
146 'action': [ 144 'action': [
147 '--library-path=>(libdir_glibc32)', 145 '--library-path=>(libdir_glibc32)',
148 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32' , 146 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32' ,
149 ], 147 ],
150 }], 148 }],
151 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. 149 # TODO(ncbray) handle arm case. We don't have ARM glibc yet.
152 ], 150 ],
153 }, 151 },
154 ], 152 ],
155 }], 153 }],
156 ], 154 ],
157 }], 155 }],
158 ], 156 ],
159 }, 157 },
160 } 158 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/ppapi_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698