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

Side by Side Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp

Issue 399523002: Shorten gyp target names for PNaCl IRT shim (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 { 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 # We keep the target names in this file short to avoid having really long 12 # We keep the target names in this file short to avoid having really long
13 # path names on Windows. 13 # path names on Windows.
14 # https://code.google.com/p/nativeclient/issues/detail?id=3846 14 # https://code.google.com/p/nativeclient/issues/detail?id=3846
15 'target_name': 'shim_aot', 15 'target_name': 'aot',
16 'type': 'none', 16 'type': 'none',
17 'variables': { 17 'variables': {
18 'nlib_target': 'libpnacl_irt_shim.a', 18 'nlib_target': 'libpnacl_irt_shim.a',
19 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_ta rget)', 19 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_ta rget)',
20 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(n lib_target)', 20 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(n lib_target)',
21 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(n lib_target)', 21 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(n lib_target)',
22 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(nli b_target)', 22 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(nli b_target)',
23 'out_pnacl_newlib_x86_32_nonsfi': '>(tc_lib_dir_pnacl_translate)/lib-x86 -32-nonsfi/>(nlib_target)', 23 'out_pnacl_newlib_x86_32_nonsfi': '>(tc_lib_dir_pnacl_translate)/lib-x86 -32-nonsfi/>(nlib_target)',
24 'build_glibc': 0, 24 'build_glibc': 0,
25 'build_newlib': 0, 25 'build_newlib': 0,
(...skipping 20 matching lines...) Expand all
46 }, 46 },
47 'dependencies': [ 47 'dependencies': [
48 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 48 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
49 ], 49 ],
50 }, 50 },
51 # Smaller shim library for PNaCl in-browser translation. 51 # Smaller shim library for PNaCl in-browser translation.
52 # Uses an unstable IRT hook interface to get the shim from the IRT itself. 52 # Uses an unstable IRT hook interface to get the shim from the IRT itself.
53 # If we ever change that hook interface or change the in-IRT shim's ABI, 53 # If we ever change that hook interface or change the in-IRT shim's ABI,
54 # we would need to clear the translation cache to match the new IRT. 54 # we would need to clear the translation cache to match the new IRT.
55 { 55 {
56 'target_name': 'shim_browser', 56 'target_name': 'browser',
57 'type': 'none', 57 'type': 'none',
58 'variables': { 58 'variables': {
59 # Same output file name as shim_aot, so that we don't need to change 59 # Same output file name as shim_aot, so that we don't need to change
60 # the linker commandlines, but output to the "for_browser" directory, 60 # the linker commandlines, but output to the "for_browser" directory,
61 # and have the pnacl_support_extension copy from that directory. 61 # and have the pnacl_support_extension copy from that directory.
62 'nlib_target': 'libpnacl_irt_shim.a', 62 'nlib_target': 'libpnacl_irt_shim.a',
63 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/for_brows er/>(nlib_target)', 63 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/for_brows er/>(nlib_target)',
jvoung (off chromium) 2014/07/16 00:19:24 Hmm... are you going to have problems when it hits
jvoung (off chromium) 2014/07/16 00:26:23 I don't think patchset 2 changed the ../for_browse
64 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for _browser/>(nlib_target)', 64 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for _browser/>(nlib_target)',
65 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for _browser/>(nlib_target)', 65 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for _browser/>(nlib_target)',
66 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/for_b rowser/>(nlib_target)', 66 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/for_b rowser/>(nlib_target)',
67 'build_glibc': 0, 67 'build_glibc': 0,
68 'build_newlib': 0, 68 'build_newlib': 0,
69 'build_pnacl_newlib': 1, 69 'build_pnacl_newlib': 1,
70 'pnacl_native_biased': 1, 70 'pnacl_native_biased': 1,
71 'enable_x86_32': 1, 71 'enable_x86_32': 1,
72 'enable_x86_64': 1, 72 'enable_x86_64': 1,
73 'enable_arm': 1, 73 'enable_arm': 1,
74 'enable_mips': 1, 74 'enable_mips': 1,
75 'sources': [ 75 'sources': [
76 'shim_entry.c', 76 'shim_entry.c',
77 'shim_ppapi.c', 77 'shim_ppapi.c',
78 ], 78 ],
79 'extra_args': [ 79 'extra_args': [
80 '--strip-debug', 80 '--strip-debug',
81 ], 81 ],
82 }, 82 },
83 'dependencies': [ 83 'dependencies': [
84 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 84 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
85 ], 85 ],
86 }, 86 },
87 { 87 {
88 # Second half of shim library for PNaCl in-browser translation. 88 # Second half of shim library for PNaCl in-browser translation.
89 # This half goes into the IRT and is returned by the unstable 89 # This half goes into the IRT and is returned by the unstable
90 # IRT hook interface. 90 # IRT hook interface.
91 'target_name': 'shim_for_irt', 91 'target_name': 'irt',
92 'type': 'none', 92 'type': 'none',
93 'variables': { 93 'variables': {
94 'nlib_target': 'libpnacl_irt_shim_for_irt.a', 94 'nlib_target': 'libpnacl_irt_shim_for_irt.a',
95 'build_glibc': 0, 95 'build_glibc': 0,
96 'build_newlib': 0, 96 'build_newlib': 0,
97 # Unlike the above, build this the way the IRT is built so that the 97 # Unlike the above, build this the way the IRT is built so that the
98 # output library directories match the IRT linking search paths. 98 # output library directories match the IRT linking search paths.
99 'build_irt': 1, 99 'build_irt': 1,
100 'sources': [ 100 'sources': [
101 'irt_shim_ppapi.c', 101 'irt_shim_ppapi.c',
102 'pnacl_shim.c', 102 'pnacl_shim.c',
103 ], 103 ],
104 }, 104 },
105 'dependencies': [ 105 'dependencies': [
106 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 106 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
107 ], 107 ],
108 }, 108 },
109 ], 109 ],
110 } 110 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698