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

Side by Side Diff: build/nacl_core_sdk.gyp

Issue 366763003: Only build the x86 arches we actually need. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: fix 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 | build/untrusted.gypi » ('j') | build/untrusted.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2012 The Native Client 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 'common.gypi', 7 'common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 20 matching lines...) Expand all
31 '../src/untrusted/irt/irt.gyp:irt_core_nexe', 31 '../src/untrusted/irt/irt.gyp:irt_core_nexe',
32 '../src/trusted/service_runtime/service_runtime.gyp:sel_ldr', 32 '../src/trusted/service_runtime/service_runtime.gyp:sel_ldr',
33 ], 33 ],
34 }], 34 }],
35 ['target_arch!="arm" and target_arch!="mipsel"', { 35 ['target_arch!="arm" and target_arch!="mipsel"', {
36 'dependencies': [ 36 'dependencies': [
37 # these libraries don't currently exist on arm and mips 37 # these libraries don't currently exist on arm and mips
38 '../src/untrusted/valgrind/valgrind.gyp:dynamic_annotations_lib', 38 '../src/untrusted/valgrind/valgrind.gyp:dynamic_annotations_lib',
39 '../src/untrusted/valgrind/valgrind.gyp:valgrind_lib', 39 '../src/untrusted/valgrind/valgrind.gyp:valgrind_lib',
40 ], 40 ],
41 }],
42 ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', {
41 'copies': [ 43 'copies': [
42 { 44 {
43 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ newlib/x86_64-nacl/lib32', 45 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ newlib/x86_64-nacl/lib32',
44 'files': [ 46 'files': [
45 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/crti.o', 47 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/crti.o',
46 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/crtn.o', 48 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/crtn.o',
47 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libnacl_dyncode.a', 49 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libnacl_dyncode.a',
48 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libnacl_list_mapping s.a', 50 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libnacl_list_mapping s.a',
49 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libnosys.a', 51 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libnosys.a',
50 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libpthread.a', 52 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libpthread.a',
51 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libvalgrind.a', 53 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libvalgrind.a',
52 ], 54 ],
53 }, 55 },
54 { 56 {
57 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ glibc/x86_64-nacl/lib32',
58 'files': [
59 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libnacl_dyncode.a',
60 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libnacl_list_mappings .a',
61 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libvalgrind.a',
62 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libdynamic_annotation s.a',
63 ],
64 },
65 ],
66 }],
67 ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', {
68 'copies': [
69 {
55 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ newlib/x86_64-nacl/lib', 70 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ newlib/x86_64-nacl/lib',
56 'files': [ 71 'files': [
57 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crti.o', 72 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crti.o',
58 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crtn.o', 73 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crtn.o',
59 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libnacl_dyncode.a', 74 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libnacl_dyncode.a',
60 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libnacl_list_mapping s.a', 75 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libnacl_list_mapping s.a',
61 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libnosys.a', 76 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libnosys.a',
62 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libpthread.a', 77 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libpthread.a',
63 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libvalgrind.a', 78 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libvalgrind.a',
64 ], 79 ],
65 }, 80 },
66 { 81 {
67 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ glibc/x86_64-nacl/lib32',
68 'files': [
69 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libnacl_dyncode.a',
70 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libnacl_list_mappings .a',
71 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libvalgrind.a',
72 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libdynamic_annotation s.a',
73 ],
74 },
75 {
76 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ glibc/x86_64-nacl/lib', 82 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_ glibc/x86_64-nacl/lib',
77 'files': [ 83 'files': [
78 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libnacl_dyncode.a', 84 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libnacl_dyncode.a',
79 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libnacl_list_mappings .a', 85 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libnacl_list_mappings .a',
80 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libvalgrind.a', 86 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libvalgrind.a',
81 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libdynamic_annotation s.a', 87 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libdynamic_annotation s.a',
82 ], 88 ],
83 }, 89 },
84 ], 90 ],
85 }], 91 }],
86 ], 92 ],
87 }, 93 },
88 ], 94 ],
89 } 95 }
90 96
OLDNEW
« no previous file with comments | « no previous file | build/untrusted.gypi » ('j') | build/untrusted.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698