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

Side by Side Diff: ppapi/ppapi_nacl_test_common.gypi

Issue 538263003: NaCl: add missing GYP dependancies on pthread_lib. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « ppapi/ppapi_nacl.gyp ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 23 matching lines...) Expand all
34 'nmf_glibc%': '>(nacl_glibc_out_dir)/>(nexe_target).nmf', 34 'nmf_glibc%': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
35 'out_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target)_newl ib_pnacl.pexe', 35 'out_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target)_newl ib_pnacl.pexe',
36 'nmf_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target).nmf' , 36 'nmf_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target).nmf' ,
37 'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out _dir)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe', 37 'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out _dir)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe',
38 'nmf_pnacl_newlib_nonsfi%': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nex e_target).nmf', 38 'nmf_pnacl_newlib_nonsfi%': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nex e_target).nmf',
39 }], 39 }],
40 ], 40 ],
41 }, 41 },
42 'dependencies': [ 42 'dependencies': [
43 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', 43 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
44 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
44 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 45 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
45 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 46 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
46 ], 47 ],
47 'target_conditions': [ 48 'target_conditions': [
48 ['test_files!=[] and build_newlib==1', { 49 ['test_files!=[] and build_newlib==1', {
49 'copies': [ 50 'copies': [
50 { 51 {
51 'destination': '>(nacl_newlib_out_dir)', 52 'destination': '>(nacl_newlib_out_dir)',
52 'files': [ 53 'files': [
53 '>@(test_files)', 54 '>@(test_files)',
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 '>@(create_nmf_args_portable)' 227 '>@(create_nmf_args_portable)'
227 ], 228 ],
228 }, 229 },
229 ], 230 ],
230 }], 231 }],
231 ], 232 ],
232 }], 233 }],
233 ], 234 ],
234 }, 235 },
235 } 236 }
OLDNEW
« no previous file with comments | « ppapi/ppapi_nacl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698