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

Side by Side Diff: chrome/nacl.gypi

Issue 11275326: Change the names of the NaCl IRT files to solve ChromeOS packaging issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « chrome/installer/mini_installer/chrome.release ('k') | chrome/tools/build/chromeos/FILES.cfg » ('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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 '../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_main_chrome', 78 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l_main_chrome',
79 ], 79 ],
80 'conditions': [ 80 'conditions': [
81 ['disable_nacl_untrusted==0', { 81 ['disable_nacl_untrusted==0', {
82 'dependencies': [ 82 'dependencies': [
83 '../ppapi/native_client/native_client.gyp:nacl_irt', 83 '../ppapi/native_client/native_client.gyp:nacl_irt',
84 '../ppapi/native_client/native_client.gyp:nacl_irt_srpc',
84 '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_s him.gyp:pnacl_irt_shim', 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 ], 86 ],
87 }], 87 }],
88 ], 88 ],
89 'direct_dependent_settings': { 89 'direct_dependent_settings': {
90 'defines': [ 90 'defines': [
91 '<@(nacl_defines)', 91 '<@(nacl_defines)',
92 ], 92 ],
93 }, 93 },
94 }, 94 },
95 ], 95 ],
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 'target_name': 'nacl_win64', 202 'target_name': 'nacl_win64',
203 'type': 'none', 203 'type': 'none',
204 'sources': [], 204 'sources': [],
205 }, 205 },
206 ], 206 ],
207 }], 207 }],
208 ], 208 ],
209 }], 209 }],
210 ], 210 ],
211 } 211 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer/chrome.release ('k') | chrome/tools/build/chromeos/FILES.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698