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

Side by Side Diff: build/all.gyp

Issue 10831316: Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted PPAPI proxy builds. (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 | build/common.gypi » ('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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 ['remoting==1', { 149 ['remoting==1', {
150 'dependencies': [ 150 'dependencies': [
151 '../remoting/remoting.gyp:*', 151 '../remoting/remoting.gyp:*',
152 ], 152 ],
153 }], 153 }],
154 ['use_openssl==0', { 154 ['use_openssl==0', {
155 'dependencies': [ 155 'dependencies': [
156 '../net/third_party/nss/ssl.gyp:*', 156 '../net/third_party/nss/ssl.gyp:*',
157 ], 157 ],
158 }], 158 }],
159 ['disable_nacl==0 and disable_nacl_untrusted==0', {
160 'dependencies': [
161 '../base/base_untrusted.gyp:*',
162 '../ipc/ipc_untrusted.gyp:*',
163 '../ppapi/ppapi_proxy_untrusted.gyp:*',
164 '../ppapi/ppapi_shared_untrusted.gyp:*',
165 ],
166 }],
167 ], 159 ],
168 }, # target_name: All 160 }, # target_name: All
169 { 161 {
170 'target_name': 'All_syzygy', 162 'target_name': 'All_syzygy',
171 'type': 'none', 163 'type': 'none',
172 'conditions': [ 164 'conditions': [
173 ['OS=="win" and fastbuild==0', { 165 ['OS=="win" and fastbuild==0', {
174 'dependencies': [ 166 'dependencies': [
175 '../chrome/installer/mini_installer_syzygy.gyp:*', 167 '../chrome/installer/mini_installer_syzygy.gyp:*',
176 ], 168 ],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', 229 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
238 '../ui/views/views.gyp:views_unittests', 230 '../ui/views/views.gyp:views_unittests',
239 '../webkit/webkit.gyp:test_shell_common', 231 '../webkit/webkit.gyp:test_shell_common',
240 ], 232 ],
241 }], 233 }],
242 ['OS=="linux"', { 234 ['OS=="linux"', {
243 'dependencies': [ 235 'dependencies': [
244 '../sandbox/sandbox.gyp:sandbox_linux_unittests', 236 '../sandbox/sandbox.gyp:sandbox_linux_unittests',
245 ], 237 ],
246 }], 238 }],
247 ['disable_nacl==0 and disable_nacl_untrusted==0', {
248 'dependencies': [
249 # TODO(bbudge): drop this when we have switched the NaCl proxy to IP C.
250 '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
251 ],
252 }],
253 ], 239 ],
254 }, # target_name: chromium_builder_tests 240 }, # target_name: chromium_builder_tests
255 { 241 {
256 'target_name': 'chromium_2010_builder_tests', 242 'target_name': 'chromium_2010_builder_tests',
257 'type': 'none', 243 'type': 'none',
258 'dependencies': [ 244 'dependencies': [
259 'chromium_builder_tests', 245 'chromium_builder_tests',
260 ], 246 ],
261 }, # target_name: chromium_2010_builder_tests 247 }, # target_name: chromium_2010_builder_tests
262 ], 248 ],
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 '../base/base.gyp:base_unittests_run', 673 '../base/base.gyp:base_unittests_run',
688 '../chrome/chrome.gyp:browser_tests_run', 674 '../chrome/chrome.gyp:browser_tests_run',
689 '../chrome/chrome.gyp:unit_tests_run', 675 '../chrome/chrome.gyp:unit_tests_run',
690 '../net/net.gyp:net_unittests_run', 676 '../net/net.gyp:net_unittests_run',
691 ], 677 ],
692 }, # target_name: chromium_swarm_tests 678 }, # target_name: chromium_swarm_tests
693 ], 679 ],
694 }], 680 }],
695 ], # conditions 681 ], # conditions
696 } 682 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698