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

Side by Side Diff: chrome/nacl.gypi

Issue 7051014: Globally replace <(library) with static_library (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 | « chrome/installer/mac/third_party/xz/xz.gyp ('k') | content/content_browser.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'nacl_target': 0, 8 'nacl_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 '__STDC_LIMIT_MACROS=1', 46 '__STDC_LIMIT_MACROS=1',
47 ], 47 ],
48 },], 48 },],
49 ], 49 ],
50 }], 50 }],
51 ], 51 ],
52 }, 52 },
53 'targets': [ 53 'targets': [
54 { 54 {
55 'target_name': 'nacl', 55 'target_name': 'nacl',
56 # The TLS (Thread Local Storage) access used by NaCl on x86-64
57 # on Linux/ELF can't be linked into a shared library, so we
58 # can't use '<(library)' here. See http://crbug.com/35829.
59 'type': 'static_library', 56 'type': 'static_library',
60 'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C', 57 'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C',
61 'variables': { 58 'variables': {
62 'nacl_target': 1, 59 'nacl_target': 1,
63 }, 60 },
64 'dependencies': [ 61 'dependencies': [
65 # TODO(gregoryd): chrome_resources and chrome_strings could be 62 # TODO(gregoryd): chrome_resources and chrome_strings could be
66 # shared with the 64-bit target, but it does not work due to a gyp 63 # shared with the 64-bit target, but it does not work due to a gyp
67 #issue 64 #issue
68 'chrome_resources', 65 'chrome_resources',
(...skipping 21 matching lines...) Expand all
90 ], 87 ],
91 }, 88 },
92 ], 89 ],
93 }, 90 },
94 ], 91 ],
95 'conditions': [ 92 'conditions': [
96 ['OS=="win"', { 93 ['OS=="win"', {
97 'targets': [ 94 'targets': [
98 { 95 {
99 'target_name': 'nacl_win64', 96 'target_name': 'nacl_win64',
100 'type': '<(library)', 97 'type': 'static_library',
101 'msvs_guid': '14135464-9FB9-42E3-99D8-791116FA1204', 98 'msvs_guid': '14135464-9FB9-42E3-99D8-791116FA1204',
102 'variables': { 99 'variables': {
103 'nacl_target': 1, 100 'nacl_target': 1,
104 }, 101 },
105 'dependencies': [ 102 'dependencies': [
106 # TODO(gregoryd): chrome_resources and chrome_strings could be 103 # TODO(gregoryd): chrome_resources and chrome_strings could be
107 # shared with the 32-bit target, but it does not work due to a gyp 104 # shared with the 32-bit target, but it does not work due to a gyp
108 #issue 105 #issue
109 'chrome_resources', 106 'chrome_resources',
110 'chrome_strings', 107 'chrome_strings',
(...skipping 18 matching lines...) Expand all
129 'NACL_BLOCK_SHIFT=5', 126 'NACL_BLOCK_SHIFT=5',
130 'NACL_BLOCK_SIZE=32', 127 'NACL_BLOCK_SIZE=32',
131 '<@(nacl_defines)', 128 '<@(nacl_defines)',
132 ], 129 ],
133 }, 130 },
134 }, 131 },
135 ], 132 ],
136 }], 133 }],
137 ], 134 ],
138 } 135 }
OLDNEW
« no previous file with comments | « chrome/installer/mac/third_party/xz/xz.gyp ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698