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

Side by Side Diff: chrome/nacl.gypi

Issue 8914026: Revert 114539 - Move content::MakeSharedMemorySegmentViaIPC into its own file (Closed) Base URL: svn://svn.chromium.org/chrome/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
« no previous file with comments | « no previous file | content/common/child_process_sandbox_support_impl_linux.h » ('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 '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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 'conditions': [ 60 'conditions': [
61 ['disable_nacl!=1', { 61 ['disable_nacl!=1', {
62 'targets': [ 62 'targets': [
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 '../ipc/ipc.gyp:ipc', 70 'chrome_resources.gyp:chrome_resources',
71 'chrome_resources.gyp:chrome_strings',
72 'common',
73 '../webkit/support/webkit_support.gyp:glue',
71 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome', 74 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome',
72 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 75 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
73 '../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',
74 ], 77 ],
75 'conditions': [ 78 'conditions': [
76 ['disable_nacl_untrusted==0', { 79 ['disable_nacl_untrusted==0', {
77 'dependencies': [ 80 'dependencies': [
78 '../ppapi/native_client/native_client.gyp:nacl_irt', 81 '../ppapi/native_client/native_client.gyp:nacl_irt',
79 ], 82 ],
80 }], 83 }],
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'target_name': 'nacl_helper', 138 'target_name': 'nacl_helper',
136 'type': 'executable', 139 'type': 'executable',
137 'include_dirs': [ 140 'include_dirs': [
138 '..', 141 '..',
139 ], 142 ],
140 'dependencies': [ 143 'dependencies': [
141 'nacl', 144 'nacl',
142 ], 145 ],
143 'sources': [ 146 'sources': [
144 'nacl/nacl_helper_linux.cc', 147 'nacl/nacl_helper_linux.cc',
145 '../chrome/common/nacl_messages.cc',
146 '../content/common/child_process_sandbox_support_impl_shm_linux. cc',
147 '../content/common/unix_domain_socket_posix.cc',
148 ], 148 ],
149 'conditions': [ 149 'conditions': [
150 ['toolkit_uses_gtk == 1', { 150 ['toolkit_uses_gtk == 1', {
151 'dependencies': [ 151 'dependencies': [
152 '../build/linux/system.gyp:gtk', 152 '../build/linux/system.gyp:gtk',
153 ], 153 ],
154 }], 154 }],
155 ['use_glib == 1', { 155 ['use_glib == 1', {
156 'dependencies': [ 156 'dependencies': [
157 '../build/linux/system.gyp:glib', 157 '../build/linux/system.gyp:glib',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 'target_name': 'nacl_win64', 190 'target_name': 'nacl_win64',
191 'type': 'none', 191 'type': 'none',
192 'sources': [], 192 'sources': [],
193 }, 193 },
194 ], 194 ],
195 }], 195 }],
196 ], 196 ],
197 }], 197 }],
198 ], 198 ],
199 } 199 }
OLDNEW
« no previous file with comments | « no previous file | content/common/child_process_sandbox_support_impl_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698