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

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

Issue 452543002: Build only the appropriate x86 arches for nacl (chrome side). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix more Created 6 years, 3 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 | « build/common_untrusted.gypi ('k') | ppapi/ppapi_nacl.gyp » ('j') | 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 27 matching lines...) Expand all
38 'conditions': [ 38 'conditions': [
39 ['target_arch=="ia32" or target_arch=="x64"', { 39 ['target_arch=="ia32" or target_arch=="x64"', {
40 'copies': [ 40 'copies': [
41 { 41 {
42 'destination': '>(tc_include_dir_glibc)/include/nacl', 42 'destination': '>(tc_include_dir_glibc)/include/nacl',
43 'files': [ 43 'files': [
44 'src/trusted/weak_ref/call_on_main_thread.h', 44 'src/trusted/weak_ref/call_on_main_thread.h',
45 'src/shared/ppapi_proxy/ppruntime.h', 45 'src/shared/ppapi_proxy/ppruntime.h',
46 ], 46 ],
47 }, 47 },
48 ],
49 }],
50 ['target_arch=="ia32"', {
51 'copies': [
48 # Here we copy linker scripts out of the Native Client repo.. 52 # Here we copy linker scripts out of the Native Client repo..
49 # These are source, not build artifacts. 53 # These are source, not build artifacts.
50 { 54 {
51 'destination': '>(tc_lib_dir_newlib32)', 55 'destination': '>(tc_lib_dir_newlib32)',
52 'files': [ 56 'files': [
53 'src/untrusted/irt_stub/libppapi.a', 57 'src/untrusted/irt_stub/libppapi.a',
54 ], 58 ],
55 }, 59 },
56 { 60 {
57 'destination': '>(tc_lib_dir_newlib64)',
58 'files': [
59 'src/untrusted/irt_stub/libppapi.a',
60 ],
61 },
62 {
63 'destination': '>(tc_lib_dir_glibc32)', 61 'destination': '>(tc_lib_dir_glibc32)',
64 'files': [ 62 'files': [
65 'src/untrusted/irt_stub/libppapi.a', 63 'src/untrusted/irt_stub/libppapi.a',
66 'src/untrusted/irt_stub/libppapi.so', 64 'src/untrusted/irt_stub/libppapi.so',
67 ], 65 ],
68 }, 66 },
67 ],
68 }],
69 ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
70 'copies': [
69 { 71 {
72 'destination': '>(tc_lib_dir_newlib64)',
73 'files': [
74 'src/untrusted/irt_stub/libppapi.a',
75 ],
76 },
77 {
70 'destination': '>(tc_lib_dir_glibc64)', 78 'destination': '>(tc_lib_dir_glibc64)',
71 'files': [ 79 'files': [
72 'src/untrusted/irt_stub/libppapi.a', 80 'src/untrusted/irt_stub/libppapi.a',
73 'src/untrusted/irt_stub/libppapi.so', 81 'src/untrusted/irt_stub/libppapi.so',
74 ], 82 ],
75 }, 83 },
76 ] 84 ]
77 }], 85 }],
78 ['target_arch=="arm"', { 86 ['target_arch=="arm"', {
79 'copies': [ 87 'copies': [
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 278 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
271 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', 279 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
272 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 280 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
273 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 281 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
274 ], 282 ],
275 }, 283 },
276 ], 284 ],
277 }], 285 }],
278 ], 286 ],
279 } 287 }
OLDNEW
« no previous file with comments | « build/common_untrusted.gypi ('k') | ppapi/ppapi_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698