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

Side by Side Diff: ppapi/native_client/native_client.gyp

Issue 11275326: Change the names of the NaCl IRT files to solve ChromeOS packaging issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | « chrome/tools/build/win/FILES.cfg ('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) 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 '../../build/common_untrusted.gypi', 7 '../../build/common_untrusted.gypi',
8 ], 8 ],
9 'conditions': [ 9 'conditions': [
10 ['disable_nacl==0 and disable_nacl_untrusted==0', { 10 ['disable_nacl==0 and disable_nacl_untrusted==0', {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 }, 64 },
65 { 65 {
66 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm', 66 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
67 'files': [ 67 'files': [
68 'src/untrusted/irt_stub/libppapi.a', 68 'src/untrusted/irt_stub/libppapi.a',
69 ], 69 ],
70 }, 70 },
71 ], 71 ],
72 }, 72 },
73 { 73 {
74 'target_name': 'nacl_irt', 74 'target_name': 'nacl_irt_srpc',
75 'type': 'none', 75 'type': 'none',
76 'variables': { 76 'variables': {
77 'nexe_target': 'nacl_irt', 77 'nexe_target': 'nacl_irt_srpc',
78 # These out_* fields override the default filenames, which 78 # These out_* fields override the default filenames, which
79 # include a "_newlib" suffix. 79 # include a "_newlib" suffix.
80 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 80 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
81 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 81 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
82 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe', 82 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_srpc_arm.nexe',
83 'build_glibc': 0, 83 'build_glibc': 0,
84 'build_newlib': 1, 84 'build_newlib': 1,
85 'include_dirs': [ 85 'include_dirs': [
86 'lib/gl/include', 86 'lib/gl/include',
87 '..', 87 '..',
88 ], 88 ],
89 'link_flags': [ 89 'link_flags': [
90 '-Wl,--start-group', 90 '-Wl,--start-group',
91 '-lirt_browser', 91 '-lirt_browser',
92 '-lppruntime', 92 '-lppruntime',
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 '../../base/base_untrusted.gyp:base_untrusted', 213 '../../base/base_untrusted.gyp:base_untrusted',
214 '../../media/media_untrusted.gyp:shared_memory_support_untrusted', 214 '../../media/media_untrusted.gyp:shared_memory_support_untrusted',
215 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', 215 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
216 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 216 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
217 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 217 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
218 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 218 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
219 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 219 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
220 ], 220 ],
221 }, 221 },
222 { 222 {
223 'target_name': 'nacl_ipc_irt', 223 'target_name': 'nacl_irt',
224 'type': 'none', 224 'type': 'none',
225 'variables': { 225 'variables': {
226 'nexe_target': 'nacl_ipc_irt', 226 'nexe_target': 'nacl_irt',
227 # These out_* fields override the default filenames, which 227 # These out_* fields override the default filenames, which
228 # include a "_newlib" suffix. 228 # include a "_newlib" suffix.
229 'out_newlib64': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe', 229 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
230 'out_newlib32': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', 230 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
231 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_ipc_irt_arm.nexe', 231 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe',
232 'build_glibc': 0, 232 'build_glibc': 0,
233 'build_newlib': 1, 233 'build_newlib': 1,
234 'include_dirs': [ 234 'include_dirs': [
235 'lib/gl/include', 235 'lib/gl/include',
236 '..', 236 '..',
237 ], 237 ],
238 'link_flags': [ 238 'link_flags': [
239 '-Wl,--start-group', 239 '-Wl,--start-group',
240 '-lirt_browser', 240 '-lirt_browser',
241 '-lppapi_proxy_untrusted', 241 '-lppapi_proxy_untrusted',
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 439 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
440 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 440 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
441 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 441 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
442 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 442 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
443 ], 443 ],
444 }, 444 },
445 ], 445 ],
446 }], 446 }],
447 ], 447 ],
448 } 448 }
OLDNEW
« no previous file with comments | « chrome/tools/build/win/FILES.cfg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698