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

Side by Side Diff: test/mac/archs/test-archs-multiarch.gyp

Issue 196283023: ninja/mac: Fix multiarch link regression caused by 1871. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 9 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 | « pylib/gyp/generator/ninja.py ('k') | test/mac/gyptest-archs.py » ('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 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'static_32_64', 8 'target_name': 'static_32_64',
9 'type': 'static_library', 9 'type': 'static_library',
10 'sources': [ 'my_file.cc' ], 10 'sources': [ 'my_file.cc' ],
11 'xcode_settings': { 11 'xcode_settings': {
12 'ARCHS': [ 'i386', 'x86_64' ], 12 'ARCHS': [ 'i386', 'x86_64' ],
13 }, 13 },
14 }, 14 },
15 { 15 {
16 'target_name': 'shared_32_64', 16 'target_name': 'shared_32_64',
17 'type': 'shared_library', 17 'type': 'shared_library',
18 'sources': [ 'my_file.cc' ], 18 'sources': [ 'my_file.cc' ],
19 'xcode_settings': { 19 'xcode_settings': {
20 'ARCHS': [ 'i386', 'x86_64' ], 20 'ARCHS': [ 'i386', 'x86_64' ],
21 }, 21 },
22 }, 22 },
23 { 23 {
24 'target_name': 'shared_32_64_bundle',
25 'product_name': 'My Framework',
26 'type': 'shared_library',
27 'mac_bundle': 1,
28 'sources': [ 'my_file.cc' ],
29 'xcode_settings': {
30 'ARCHS': [ 'i386', 'x86_64' ],
31 },
32 },
33 {
24 'target_name': 'module_32_64', 34 'target_name': 'module_32_64',
25 'type': 'loadable_module', 35 'type': 'loadable_module',
26 'sources': [ 'my_file.cc' ], 36 'sources': [ 'my_file.cc' ],
27 'xcode_settings': { 37 'xcode_settings': {
28 'ARCHS': [ 'i386', 'x86_64' ], 38 'ARCHS': [ 'i386', 'x86_64' ],
29 }, 39 },
30 }, 40 },
31 { 41 {
42 'target_name': 'module_32_64_bundle',
43 'product_name': 'My Bundle',
44 'type': 'loadable_module',
45 'mac_bundle': 1,
46 'sources': [ 'my_file.cc' ],
47 'xcode_settings': {
48 'ARCHS': [ 'i386', 'x86_64' ],
49 },
50 },
51 {
32 'target_name': 'exe_32_64', 52 'target_name': 'exe_32_64',
33 'type': 'executable', 53 'type': 'executable',
34 'sources': [ 'empty_main.cc' ], 54 'sources': [ 'empty_main.cc' ],
35 'xcode_settings': { 55 'xcode_settings': {
36 'ARCHS': [ 'i386', 'x86_64' ], 56 'ARCHS': [ 'i386', 'x86_64' ],
37 }, 57 },
38 }, 58 },
39 { 59 {
40 'target_name': 'exe_32_64_bundle', 60 'target_name': 'exe_32_64_bundle',
41 'product_name': 'Test App', 61 'product_name': 'Test App',
(...skipping 21 matching lines...) Expand all
63 'dependencies': [ 83 'dependencies': [
64 'static_32_64', 84 'static_32_64',
65 ], 85 ],
66 'sources': [], 86 'sources': [],
67 'xcode_settings': { 87 'xcode_settings': {
68 'ARCHS': ['i386', 'x86_64'], 88 'ARCHS': ['i386', 'x86_64'],
69 }, 89 },
70 }, 90 },
71 ] 91 ]
72 } 92 }
OLDNEW
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/mac/gyptest-archs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698