Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| 11 # The full library, which PNaCl uses for offline .pexe -> .nexe. | 11 # The full library, which PNaCl uses for offline .pexe -> .nexe. |
| 12 'target_name': 'pnacl_irt_shim_aot', | 12 'target_name': 'shim_aot', |
|
Mark Seaborn
2014/05/05 21:02:52
Maybe comment here that we're keeping the name sho
Derek Schuff
2014/05/05 21:34:53
Done.
| |
| 13 'type': 'none', | 13 'type': 'none', |
| 14 'variables': { | 14 'variables': { |
| 15 'nlib_target': 'libpnacl_irt_shim.a', | 15 'nlib_target': 'libpnacl_irt_shim.a', |
| 16 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_ta rget)', | 16 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_ta rget)', |
| 17 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(n lib_target)', | 17 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(n lib_target)', |
| 18 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(n lib_target)', | 18 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(n lib_target)', |
| 19 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(nli b_target)', | 19 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(nli b_target)', |
| 20 'out_pnacl_newlib_x86_32_nonsfi': '>(tc_lib_dir_pnacl_translate)/lib-x86 -32-nonsfi/>(nlib_target)', | 20 'out_pnacl_newlib_x86_32_nonsfi': '>(tc_lib_dir_pnacl_translate)/lib-x86 -32-nonsfi/>(nlib_target)', |
| 21 'build_glibc': 0, | 21 'build_glibc': 0, |
| 22 'build_newlib': 0, | 22 'build_newlib': 0, |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 43 }, | 43 }, |
| 44 'dependencies': [ | 44 'dependencies': [ |
| 45 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 45 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 46 ], | 46 ], |
| 47 }, | 47 }, |
| 48 # Smaller shim library for PNaCl in-browser translation. | 48 # Smaller shim library for PNaCl in-browser translation. |
| 49 # Uses an unstable IRT hook interface to get the shim from the IRT itself. | 49 # Uses an unstable IRT hook interface to get the shim from the IRT itself. |
| 50 # If we ever change that hook interface or change the in-IRT shim's ABI, | 50 # If we ever change that hook interface or change the in-IRT shim's ABI, |
| 51 # we would need to clear the translation cache to match the new IRT. | 51 # we would need to clear the translation cache to match the new IRT. |
| 52 { | 52 { |
| 53 'target_name': 'pnacl_irt_shim_browser', | 53 'target_name': 'shim_browser', |
| 54 'type': 'none', | 54 'type': 'none', |
| 55 'variables': { | 55 'variables': { |
| 56 # Same name as pnacl_irt_shim_aot, so that we don't need to change | 56 # Same output file name as shim_aot, so that we don't need to change |
| 57 # the linker commandlines, but output to the "for_browser" directory, | 57 # the linker commandlines, but output to the "for_browser" directory, |
| 58 # and have the pnacl_support_extension copy from that directory. | 58 # and have the pnacl_support_extension copy from that directory. |
| 59 'nlib_target': 'libpnacl_irt_shim.a', | 59 'nlib_target': 'libpnacl_irt_shim.a', |
| 60 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/for_brows er/>(nlib_target)', | 60 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/for_brows er/>(nlib_target)', |
| 61 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for _browser/>(nlib_target)', | 61 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for _browser/>(nlib_target)', |
| 62 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for _browser/>(nlib_target)', | 62 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for _browser/>(nlib_target)', |
| 63 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/for_b rowser/>(nlib_target)', | 63 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/for_b rowser/>(nlib_target)', |
| 64 'build_glibc': 0, | 64 'build_glibc': 0, |
| 65 'build_newlib': 0, | 65 'build_newlib': 0, |
| 66 'build_pnacl_newlib': 1, | 66 'build_pnacl_newlib': 1, |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 78 ], | 78 ], |
| 79 }, | 79 }, |
| 80 'dependencies': [ | 80 'dependencies': [ |
| 81 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 81 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 82 ], | 82 ], |
| 83 }, | 83 }, |
| 84 { | 84 { |
| 85 # Second half of shim library for PNaCl in-browser translation. | 85 # Second half of shim library for PNaCl in-browser translation. |
| 86 # This half goes into the IRT and is returned by the unstable | 86 # This half goes into the IRT and is returned by the unstable |
| 87 # IRT hook interface. | 87 # IRT hook interface. |
| 88 'target_name': 'pnacl_irt_shim_for_irt', | 88 'target_name': 'shim_for_irt', |
| 89 'type': 'none', | 89 'type': 'none', |
| 90 'variables': { | 90 'variables': { |
| 91 'nlib_target': 'libpnacl_irt_shim_for_irt.a', | 91 'nlib_target': 'libpnacl_irt_shim_for_irt.a', |
| 92 'build_glibc': 0, | 92 'build_glibc': 0, |
| 93 'build_newlib': 0, | 93 'build_newlib': 0, |
| 94 # Unlike the above, build this the way the IRT is built so that the | 94 # Unlike the above, build this the way the IRT is built so that the |
| 95 # output library directories match the IRT linking search paths. | 95 # output library directories match the IRT linking search paths. |
| 96 'build_irt': 1, | 96 'build_irt': 1, |
| 97 'sources': [ | 97 'sources': [ |
| 98 'irt_shim_ppapi.c', | 98 'irt_shim_ppapi.c', |
| 99 'pnacl_shim.c', | 99 'pnacl_shim.c', |
| 100 ], | 100 ], |
| 101 }, | 101 }, |
| 102 'dependencies': [ | 102 'dependencies': [ |
| 103 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 103 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 104 ], | 104 ], |
| 105 }, | 105 }, |
| 106 ], | 106 ], |
| 107 } | 107 } |
| OLD | NEW |