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: build/all.gyp

Issue 10836220: 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') | chrome/browser/nacl_host/nacl_browser.cc » ('J')
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
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', { 159 ['disable_nacl==0 and disable_nacl_untrusted==0', {
160 'dependencies': [ 160 'dependencies': [
161 '../base/base_untrusted.gyp:*', 161 '../base/base_untrusted.gyp:*',
162 '../ipc/ipc_untrusted.gyp:*', 162 '../ipc/ipc_untrusted.gyp:*',
163 '../ppapi/ppapi_proxy_untrusted.gyp:*', 163 '../ppapi/ppapi_chrome_proxy_untrusted.gyp:*',
164 '../ppapi/ppapi_shared_untrusted.gyp:*', 164 '../ppapi/ppapi_shared_untrusted.gyp:*',
165 ], 165 ],
166 }], 166 }],
167 ], 167 ],
168 }, # target_name: All 168 }, # target_name: All
169 { 169 {
170 'target_name': 'All_syzygy', 170 'target_name': 'All_syzygy',
171 'type': 'none', 171 'type': 'none',
172 'conditions': [ 172 'conditions': [
173 ['OS=="win" and fastbuild==0', { 173 ['OS=="win" and fastbuild==0', {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 '../webkit/webkit.gyp:test_shell_common', 239 '../webkit/webkit.gyp:test_shell_common',
240 ], 240 ],
241 }], 241 }],
242 ['OS=="linux"', { 242 ['OS=="linux"', {
243 'dependencies': [ 243 'dependencies': [
244 '../sandbox/sandbox.gyp:sandbox_linux_unittests', 244 '../sandbox/sandbox.gyp:sandbox_linux_unittests',
245 ], 245 ],
246 }], 246 }],
247 ['disable_nacl==0 and disable_nacl_untrusted==0', { 247 ['disable_nacl==0 and disable_nacl_untrusted==0', {
248 'dependencies': [ 248 'dependencies': [
249 # TODO(bbudge): drop this when we have switched the NaCl proxy to IP C. 249 # TODO(bbudge): drop this when we have switched the NaCl proxy to IP C.
dmichael (off chromium) 2012/08/14 17:03:31 Is this TODO still valid? Aren't we going to still
bbudge 2012/08/14 18:35:18 Actually, now that we have side-by-side builds, we
250 '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted', 250 '../ppapi/ppapi_chrome_proxy_untrusted.gyp:ppapi_proxy_untrusted',
251 ], 251 ],
252 }], 252 }],
253 ], 253 ],
254 }, # target_name: chromium_builder_tests 254 }, # target_name: chromium_builder_tests
255 { 255 {
256 'target_name': 'chromium_2010_builder_tests', 256 'target_name': 'chromium_2010_builder_tests',
257 'type': 'none', 257 'type': 'none',
258 'dependencies': [ 258 'dependencies': [
259 'chromium_builder_tests', 259 'chromium_builder_tests',
260 ], 260 ],
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 '../base/base.gyp:base_unittests_run', 679 '../base/base.gyp:base_unittests_run',
680 '../chrome/chrome.gyp:browser_tests_run', 680 '../chrome/chrome.gyp:browser_tests_run',
681 '../chrome/chrome.gyp:unit_tests_run', 681 '../chrome/chrome.gyp:unit_tests_run',
682 '../net/net.gyp:net_unittests_run', 682 '../net/net.gyp:net_unittests_run',
683 ], 683 ],
684 }, # target_name: chromium_swarm_tests 684 }, # target_name: chromium_swarm_tests
685 ], 685 ],
686 }], 686 }],
687 ], # conditions 687 ], # conditions
688 } 688 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | chrome/browser/nacl_host/nacl_browser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698