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

Side by Side Diff: chrome/nacl.gypi

Issue 8440004: This CL is based on the patch: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | « build/scan_sources.py ('k') | ppapi/native_client/native_client.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) 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 'includes': [
7 '../native_client/build/untrusted.gypi',
8 ],
6 'target_defaults': { 9 'target_defaults': {
7 'variables': { 10 'variables': {
8 'nacl_target': 0, 11 'nacl_target': 0,
9 }, 12 },
10 'target_conditions': [ 13 'target_conditions': [
11 # This part is shared between the targets defined below. Only files and 14 # This part is shared between the targets defined below. Only files and
12 # settings relevant for building the Win64 target should be added here. 15 # settings relevant for building the Win64 target should be added here.
13 ['nacl_target==1', { 16 ['nacl_target==1', {
14 'include_dirs': [ 17 'include_dirs': [
15 '<(INTERMEDIATE_DIR)', 18 '<(INTERMEDIATE_DIR)',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ], 58 ],
56 }, 59 },
57 'conditions': [ 60 'conditions': [
58 ['disable_nacl!=1', { 61 ['disable_nacl!=1', {
59 'targets': [ 62 'targets': [
60 { 63 {
61 'target_name': 'nacl', 64 'target_name': 'nacl',
62 'type': 'static_library', 65 'type': 'static_library',
63 'variables': { 66 'variables': {
64 'nacl_target': 1, 67 'nacl_target': 1,
65 'irt_build_cmd': [ 68 },
66 'python', 'build_nacl_irt.py', '--outdir', '<(PRODUCT_DIR)',
67 ],
68 'irt_inputs_cmd':
69 'python build_nacl_irt.py --inputs',
70 },
71 'dependencies': [ 69 'dependencies': [
70 # TODO(gregoryd): chrome_resources and chrome_strings could be
71 # shared with the 64-bit target, but it does not work due to a gyp
72 # issue
72 'chrome_resources', 73 'chrome_resources',
73 'chrome_strings', 74 'chrome_strings',
74 'common', 75 'common',
76 '../ppapi/native_client/native_client.gyp:nacl_irt',
75 '../webkit/support/webkit_support.gyp:glue', 77 '../webkit/support/webkit_support.gyp:glue',
76 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome', 78 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome',
77 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 79 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
78 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib', 80 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib',
79 ], 81 ],
80 'direct_dependent_settings': { 82 'direct_dependent_settings': {
81 'defines': [ 83 'defines': [
82 'NACL_BLOCK_SHIFT=5', 84 'NACL_BLOCK_SHIFT=5',
83 'NACL_BLOCK_SIZE=32', 85 'NACL_BLOCK_SIZE=32',
84 '<@(nacl_defines)', 86 '<@(nacl_defines)',
85 ], 87 ],
86 }, 88 },
87 'conditions': [
88 ['OS=="win"', {
89 # Windows needs both the x86-32 and x86-64 IRT.
90 'actions': [
91 {
92 'action_name': 'nacl_irt',
93 'message': 'Building NaCl IRT',
94 'inputs': [
95 '<!@(<(irt_inputs_cmd) --platform=x86-32 --platform=x86-64)' ,
96 ],
97 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
98 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
99 'action': [
100 '<@(irt_build_cmd)',
101 '--platform', 'x86-32',
102 '--platform', 'x86-64',
103 ],
104 },
105 ],
106 }],
107 ['OS!="win" and target_arch=="ia32"', {
108 # Linux-x86-32 and OSX need only the x86-32 IRT.
109 'actions': [
110 {
111 'action_name': 'nacl_irt',
112 'message': 'Building NaCl IRT',
113 'inputs': [
114 '<!@(<(irt_inputs_cmd) --platform=x86-32)',
115 ],
116 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'],
117 'action': [
118 '<@(irt_build_cmd)', '--platform', 'x86-32',
119 ],
120 },
121 ],
122 }],
123 ['OS!="win" and target_arch=="x64"', {
124 # Linux-x86-64 needs only the x86-64 IRT.
125 'actions': [
126 {
127 'action_name': 'nacl_irt',
128 'message': 'Building NaCl IRT',
129 'inputs': [
130 '<!@(<(irt_inputs_cmd) --platform=x86-64)',
131 ],
132 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
133 'action': [
134 '<@(irt_build_cmd)', '--platform', 'x86-64',
135 ],
136 },
137 ],
138 }],
139 ['OS!="win" and target_arch=="arm"', {
140 'actions': [
141 {
142 'action_name': 'nacl_irt',
143 'message': 'Building NaCl IRT',
144 'inputs': [
145 '<!@(<(irt_inputs_cmd) --platform=arm)',
146 ],
147 'outputs': ['<(PRODUCT_DIR)/nacl_irt_arm.nexe'],
148 'action': [
149 '<@(irt_build_cmd)', '--platform', 'arm',
150 ],
151 },
152 ],
153 }],
154 ],
155 }, 89 },
156 ], 90 ],
157 'conditions': [ 91 'conditions': [
158 ['OS=="win"', { 92 ['OS=="win"', {
159 'targets': [ 93 'targets': [
160 { 94 {
161 'target_name': 'nacl_win64', 95 'target_name': 'nacl_win64',
162 'type': 'static_library', 96 'type': 'static_library',
163 'variables': { 97 'variables': {
164 'nacl_target': 1, 98 'nacl_target': 1,
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 'target_name': 'nacl_win64', 339 'target_name': 'nacl_win64',
406 'type': 'none', 340 'type': 'none',
407 'sources': [], 341 'sources': [],
408 }, 342 },
409 ], 343 ],
410 }], 344 }],
411 ], 345 ],
412 }], 346 }],
413 ], 347 ],
414 } 348 }
OLDNEW
« no previous file with comments | « build/scan_sources.py ('k') | ppapi/native_client/native_client.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698