| OLD | NEW |
| 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 |
| 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 'generate_nmf%': 1, | 18 'generate_nmf%': 1, |
| 19 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib', | 19 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib', |
| 20 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc', | 20 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc', |
| 21 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl
', | 21 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl
', |
| 22 'nacl_pnacl_newlib_nonsfi_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir
)/nonsfi', |
| 22 'target_conditions': [ | 23 'target_conditions': [ |
| 23 ['nexe_target!=""', { | 24 ['nexe_target!=""', { |
| 24 # These variables are used for nexe building and for library building. | 25 # These variables are used for nexe building and for library building. |
| 25 'out_newlib32%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.
nexe', | 26 'out_newlib32%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.
nexe', |
| 26 'out_newlib64%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.
nexe', | 27 'out_newlib64%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.
nexe', |
| 27 'out_newlib_arm%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.n
exe', | 28 'out_newlib_arm%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.n
exe', |
| 28 'out_newlib_mips%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_mips
32.nexe', | 29 'out_newlib_mips%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_mips
32.nexe', |
| 29 'nmf_newlib%': '>(nacl_newlib_out_dir)/>(nexe_target).nmf', | 30 'nmf_newlib%': '>(nacl_newlib_out_dir)/>(nexe_target).nmf', |
| 30 'out_glibc32%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nex
e', | 31 'out_glibc32%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nex
e', |
| 31 'out_glibc64%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nex
e', | 32 'out_glibc64%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nex
e', |
| 32 'out_glibc_arm%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe
', | 33 'out_glibc_arm%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe
', |
| 33 'nmf_glibc%': '>(nacl_glibc_out_dir)/>(nexe_target).nmf', | 34 'nmf_glibc%': '>(nacl_glibc_out_dir)/>(nexe_target).nmf', |
| 34 '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', |
| 35 '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', |
| 36 }], | 38 }], |
| 37 ], | 39 ], |
| 38 }, | 40 }, |
| 39 'dependencies': [ | 41 'dependencies': [ |
| 40 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', | 42 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', |
| 41 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', | 43 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', |
| 42 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', | 44 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', |
| 43 ], | 45 ], |
| 44 'target_conditions': [ | 46 'target_conditions': [ |
| 45 ['test_files!=[] and build_newlib==1', { | 47 ['test_files!=[] and build_newlib==1', { |
| 46 'copies': [ | 48 'copies': [ |
| 47 { | 49 { |
| 48 'destination': '>(nacl_newlib_out_dir)', | 50 'destination': '>(nacl_newlib_out_dir)', |
| 49 'files': [ | 51 'files': [ |
| 50 '>@(test_files)', | 52 '>@(test_files)', |
| 51 ], | 53 ], |
| 52 }, | 54 }, |
| 53 ], | 55 ], |
| 54 }], | 56 }], |
| 55 ['test_files!=[] and "<(target_arch)"!="arm" and "<(target_arch)"!="mipsel
" and disable_glibc==0 and build_glibc==1', { | 57 ['test_files!=[] and "<(target_arch)"!="arm" and "<(target_arch)"!="mipsel
" and disable_glibc==0 and build_glibc==1', { |
| 56 'copies': [ | 58 'copies': [ |
| 57 { | 59 { |
| 58 'destination': '>(nacl_glibc_out_dir)', | 60 'destination': '>(nacl_glibc_out_dir)', |
| 59 'files': [ | 61 'files': [ |
| 60 '>@(test_files)', | 62 '>@(test_files)', |
| 61 ], | 63 ], |
| 62 }, | 64 }, |
| 63 ], | 65 ], |
| 64 }], | 66 }], |
| 65 ['test_files!=[] and build_pnacl_newlib==1 and disable_pnacl==0', { | 67 # Nonsfi pnacl copy is covered below. Currently, these are exclusive. |
| 68 ['test_files!=[] and build_pnacl_newlib==1 and disable_pnacl==0 and enable
_x86_32_nonsfi==0', { |
| 66 'copies': [ | 69 'copies': [ |
| 67 { | 70 { |
| 68 'destination': '>(nacl_pnacl_newlib_out_dir)', | 71 'destination': '>(nacl_pnacl_newlib_out_dir)', |
| 69 'files': [ | 72 'files': [ |
| 70 '>@(test_files)', | 73 '>@(test_files)', |
| 71 ], | 74 ], |
| 72 }, | 75 }, |
| 73 ], | 76 ], |
| 74 }], | 77 }], |
| 78 ['test_files!=[] and build_pnacl_newlib==1 and enable_x86_32_nonsfi==1', { |
| 79 'copies': [ |
| 80 { |
| 81 'destination': '>(nacl_pnacl_newlib_nonsfi_out_dir)', |
| 82 'files': [ |
| 83 '>@(test_files)', |
| 84 ], |
| 85 }, |
| 86 ], |
| 87 }], |
| 75 ['nexe_target!=""', { | 88 ['nexe_target!=""', { |
| 76 'variables': { | 89 'variables': { |
| 77 # Patch over the fact that untrusted.gypi doesn't define these in all | 90 # Patch over the fact that untrusted.gypi doesn't define these in all |
| 78 # cases. | 91 # cases. |
| 79 'enable_x86_64%': 0, | 92 'enable_x86_64%': 0, |
| 80 'enable_x86_32%': 0, | 93 'enable_x86_32%': 0, |
| 81 'enable_arm%': 0, | 94 'enable_arm%': 0, |
| 82 'enable_mips%': 0, | 95 'enable_mips%': 0, |
| 83 'include_dirs': [ | 96 'include_dirs': [ |
| 84 '<(DEPTH)', | 97 '<(DEPTH)', |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 '>@(create_nmf_args_portable)', | 204 '>@(create_nmf_args_portable)', |
| 192 ], | 205 ], |
| 193 }, | 206 }, |
| 194 ], | 207 ], |
| 195 }], | 208 }], |
| 196 ], | 209 ], |
| 197 }], | 210 }], |
| 198 ], | 211 ], |
| 199 }, | 212 }, |
| 200 } | 213 } |
| OLD | NEW |