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

Side by Side Diff: chrome/nacl.gypi

Issue 10831331: Fix NaCl IPC proxy untrusted build on arm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « no previous file | no next file » | 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 '../base/base.gyp:base', 73 '../base/base.gyp:base',
74 '../ipc/ipc.gyp:ipc', 74 '../ipc/ipc.gyp:ipc',
75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome', 75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome',
76 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 76 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
77 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib', 77 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib',
78 ], 78 ],
79 'conditions': [ 79 'conditions': [
80 ['disable_nacl_untrusted==0', { 80 ['disable_nacl_untrusted==0', {
81 'dependencies': [ 81 'dependencies': [
82 '../ppapi/native_client/native_client.gyp:nacl_irt', 82 '../ppapi/native_client/native_client.gyp:nacl_irt',
83 ],
84 }],
85 ['disable_nacl_untrusted==0 and target_arch!="arm"', {
86 'dependencies': [
83 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt', 87 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt',
84 ], 88 ],
85 }], 89 }],
86 ], 90 ],
87 'direct_dependent_settings': { 91 'direct_dependent_settings': {
88 'defines': [ 92 'defines': [
89 '<@(nacl_defines)', 93 '<@(nacl_defines)',
90 ], 94 ],
91 }, 95 },
92 }, 96 },
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 'target_name': 'nacl_win64', 200 'target_name': 'nacl_win64',
197 'type': 'none', 201 'type': 'none',
198 'sources': [], 202 'sources': [],
199 }, 203 },
200 ], 204 ],
201 }], 205 }],
202 ], 206 ],
203 }], 207 }],
204 ], 208 ],
205 } 209 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698