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

Side by Side Diff: chrome/nacl.gypi

Issue 10908085: Add pnacl shims to the chrome build. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: presubmit Created 8 years, 3 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
« no previous file with comments | « PRESUBMIT.py ('k') | ppapi/generators/generator.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 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome', 75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome',
76 '../ppapi/ppapi_internal.gyp:ppapi_shared', 76 '../ppapi/ppapi_internal.gyp:ppapi_shared',
77 '../ppapi/ppapi_internal.gyp:ppapi_ipc', 77 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
78 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 78 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
79 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib', 79 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib',
80 ], 80 ],
81 'conditions': [ 81 'conditions': [
82 ['disable_nacl_untrusted==0', { 82 ['disable_nacl_untrusted==0', {
83 'dependencies': [ 83 'dependencies': [
84 '../ppapi/native_client/native_client.gyp:nacl_irt', 84 '../ppapi/native_client/native_client.gyp:nacl_irt',
85 '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_s him.gyp:pnacl_irt_shim',
85 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt', 86 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt',
86 ], 87 ],
87 }], 88 }],
88 ], 89 ],
89 'direct_dependent_settings': { 90 'direct_dependent_settings': {
90 'defines': [ 91 'defines': [
91 '<@(nacl_defines)', 92 '<@(nacl_defines)',
92 ], 93 ],
93 }, 94 },
94 }, 95 },
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 'target_name': 'nacl_win64', 204 'target_name': 'nacl_win64',
204 'type': 'none', 205 'type': 'none',
205 'sources': [], 206 'sources': [],
206 }, 207 },
207 ], 208 ],
208 }], 209 }],
209 ], 210 ],
210 }], 211 }],
211 ], 212 ],
212 } 213 }
OLDNEW
« no previous file with comments | « PRESUBMIT.py ('k') | ppapi/generators/generator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698