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

Side by Side Diff: chrome/nacl.gypi

Issue 8905007: Put irt and untrusted TC dependencies behind a flag. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years 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
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 'include': [ 6 'include': [
7 '../native_client/build/untrusted.gypi', 7 '../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 'variables': { 10 'variables': {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 { 63 {
64 'target_name': 'nacl', 64 'target_name': 'nacl',
65 'type': 'static_library', 65 'type': 'static_library',
66 'variables': { 66 'variables': {
67 'nacl_target': 1, 67 'nacl_target': 1,
68 }, 68 },
69 'dependencies': [ 69 'dependencies': [
70 'chrome_resources.gyp:chrome_resources', 70 'chrome_resources.gyp:chrome_resources',
71 'chrome_resources.gyp:chrome_strings', 71 'chrome_resources.gyp:chrome_strings',
72 'common', 72 'common',
73 '../ppapi/native_client/native_client.gyp:nacl_irt',
74 '../webkit/support/webkit_support.gyp:glue', 73 '../webkit/support/webkit_support.gyp:glue',
75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome', 74 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome',
76 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 75 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
77 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib', 76 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib',
78 ], 77 ],
78 'conditions': [
79 ['disable_nacl_untrusted!=1', {
80 'dependencies': [
81 '../ppapi/native_client/native_client.gyp:nacl_irt',
82 ],
83 }],
84 ],
79 'direct_dependent_settings': { 85 'direct_dependent_settings': {
80 'defines': [ 86 'defines': [
81 'NACL_BLOCK_SHIFT=5', 87 'NACL_BLOCK_SHIFT=5',
82 'NACL_BLOCK_SIZE=32', 88 'NACL_BLOCK_SIZE=32',
83 '<@(nacl_defines)', 89 '<@(nacl_defines)',
84 ], 90 ],
85 }, 91 },
86 }, 92 },
87 ], 93 ],
88 'conditions': [ 94 'conditions': [
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 'target_name': 'nacl_win64', 211 'target_name': 'nacl_win64',
206 'type': 'none', 212 'type': 'none',
207 'sources': [], 213 'sources': [],
208 }, 214 },
209 ], 215 ],
210 }], 216 }],
211 ], 217 ],
212 }], 218 }],
213 ], 219 ],
214 } 220 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698