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

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

Issue 1097153002: NaCl/GYP: remove references to prep_toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit Created 5 years, 8 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
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 {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'shim_ppapi.c', 44 'shim_ppapi.c',
45 ], 45 ],
46 'extra_args': [ 46 'extra_args': [
47 '--strip-debug', 47 '--strip-debug',
48 ], 48 ],
49 # Indicate that shim should not depend on unstable IRT hook interface. 49 # Indicate that shim should not depend on unstable IRT hook interface.
50 'compile_flags': [ 50 'compile_flags': [
51 '-DPNACL_SHIM_AOT', 51 '-DPNACL_SHIM_AOT',
52 ], 52 ],
53 }, 53 },
54 'dependencies': [
55 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
56 ],
57 }, 54 },
58 # Smaller shim library for PNaCl in-browser translation. 55 # Smaller shim library for PNaCl in-browser translation.
59 # Uses an unstable IRT hook interface to get the shim from the IRT itself. 56 # Uses an unstable IRT hook interface to get the shim from the IRT itself.
60 # If we ever change that hook interface or change the in-IRT shim's ABI, 57 # If we ever change that hook interface or change the in-IRT shim's ABI,
61 # we would need to clear the translation cache to match the new IRT. 58 # we would need to clear the translation cache to match the new IRT.
62 { 59 {
63 'target_name': 'browser', 60 'target_name': 'browser',
64 'type': 'none', 61 'type': 'none',
65 'variables': { 62 'variables': {
66 # Same output file name as shim_aot, so that we don't need to change 63 # Same output file name as shim_aot, so that we don't need to change
(...skipping 13 matching lines...) Expand all
80 'enable_arm': 1, 77 'enable_arm': 1,
81 'enable_mips': 1, 78 'enable_mips': 1,
82 'sources': [ 79 'sources': [
83 'shim_entry.c', 80 'shim_entry.c',
84 'shim_ppapi.c', 81 'shim_ppapi.c',
85 ], 82 ],
86 'extra_args': [ 83 'extra_args': [
87 '--strip-debug', 84 '--strip-debug',
88 ], 85 ],
89 }, 86 },
90 'dependencies': [
91 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
92 ],
93 }, 87 },
94 { 88 {
95 # Second half of shim library for PNaCl in-browser translation. 89 # Second half of shim library for PNaCl in-browser translation.
96 # This half goes into the IRT and is returned by the unstable 90 # This half goes into the IRT and is returned by the unstable
97 # IRT hook interface. 91 # IRT hook interface.
98 'target_name': 'irt', 92 'target_name': 'irt',
99 'type': 'none', 93 'type': 'none',
100 'variables': { 94 'variables': {
101 'nlib_target': 'libpnacl_irt_shim_for_irt.a', 95 'nlib_target': 'libpnacl_irt_shim_for_irt.a',
102 'build_glibc': 0, 96 'build_glibc': 0,
103 'build_newlib': 0, 97 'build_newlib': 0,
104 # Unlike the above, build this the way the IRT is built so that the 98 # Unlike the above, build this the way the IRT is built so that the
105 # output library directories match the IRT linking search paths. 99 # output library directories match the IRT linking search paths.
106 'build_irt': 1, 100 'build_irt': 1,
107 'sources': [ 101 'sources': [
108 'irt_shim_ppapi.c', 102 'irt_shim_ppapi.c',
109 'pnacl_shim.c', 103 'pnacl_shim.c',
110 ], 104 ],
111 }, 105 },
112 'dependencies': [
113 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
114 ],
115 }, 106 },
116 ], 107 ],
117 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698