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

Side by Side Diff: ppapi/ppapi_untrusted.gyp

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 | « chrome/test/data/nacl/nacl_browser_test.gypi ('k') | 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 (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 # This GYP file defines untrusted (NaCl) targets. All targets in this 5 # This GYP file defines untrusted (NaCl) targets. All targets in this
6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid 6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
7 # requiring NaCl sources for building. 7 # requiring NaCl sources for building.
8 8
9 { 9 {
10 'includes': [ 10 'includes': [
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 'sources': [ 104 'sources': [
105 '<@(test_common_source_files)', 105 '<@(test_common_source_files)',
106 '<@(test_nacl_source_files)', 106 '<@(test_nacl_source_files)',
107 ], 107 ],
108 }, 108 },
109 'conditions': [ 109 'conditions': [
110 ['target_arch!="arm"', { 110 ['target_arch!="arm"', {
111 'variables': { 111 'variables': {
112 'compile_flags': [ 112 'compile_flags': [
113 '-mno-tls-use-call', 113 '-mno-tls-use-call',
114 » ], 114 ],
115 }, 115 },
116 }], 116 }],
117 ['target_arch!="arm" and disable_glibc==0', { 117 ['target_arch!="arm" and disable_glibc==0', {
118 'variables': { 118 'variables': {
119 'build_glibc': 1, 119 'build_glibc': 1,
120 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which 120 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
121 # doesn't work on Windows. 121 # doesn't work on Windows.
122 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', 122 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
123 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', 123 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
124 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', 124 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
(...skipping 11 matching lines...) Expand all
136 'python', 136 'python',
137 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', 137 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
138 '>@(_inputs)', 138 '>@(_inputs)',
139 '--objdump=>(nacl_objdump)', 139 '--objdump=>(nacl_objdump)',
140 '--library-path=>(libdir_glibc64)', 140 '--library-path=>(libdir_glibc64)',
141 '--library-path=>(libdir_glibc32)', 141 '--library-path=>(libdir_glibc32)',
142 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32', 142 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
143 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64', 143 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
144 '--output=>(nmf_glibc)', 144 '--output=>(nmf_glibc)',
145 '--stage-dependencies=<(PRODUCT_DIR)', 145 '--stage-dependencies=<(PRODUCT_DIR)',
146 '--toolchain=glibc',
147 ], 146 ],
148 }, 147 },
149 ], 148 ],
150 }], 149 }],
151 ], 150 ],
152 }, 151 },
153 ], 152 ],
154 } 153 }
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/nacl_browser_test.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698