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

Side by Side Diff: build/all.gyp

Issue 15054005: Move all_webkit inside OS!="ios" block in all.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 '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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 ], 179 ],
180 }], 180 }],
181 ['enable_app_list==1', { 181 ['enable_app_list==1', {
182 'dependencies': [ 182 'dependencies': [
183 '../ui/app_list/app_list.gyp:*', 183 '../ui/app_list/app_list.gyp:*',
184 ], 184 ],
185 }], 185 }],
186 ], 186 ],
187 }, # target_name: All 187 }, # target_name: All
188 { 188 {
189 'target_name': 'all_webkit',
190 'type': 'none',
191 'dependencies': [
192 '../third_party/WebKit/public/all.gyp:all_blink',
193 '../content/content.gyp:content_shell',
194 ],
195 }, # target_name: all_webkit
196 {
197 'target_name': 'All_syzygy', 189 'target_name': 'All_syzygy',
198 'type': 'none', 190 'type': 'none',
199 'conditions': [ 191 'conditions': [
200 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { 192 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', {
201 'dependencies': [ 193 'dependencies': [
202 '../chrome/installer/mini_installer_syzygy.gyp:*', 194 '../chrome/installer/mini_installer_syzygy.gyp:*',
203 ], 195 ],
204 }, 196 },
205 ], 197 ],
206 ], 198 ],
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 'type': 'none', 306 'type': 'none',
315 'dependencies': [ 307 'dependencies': [
316 'chromium_builder_tests', 308 'chromium_builder_tests',
317 ], 309 ],
318 }, # target_name: chromium_2010_builder_tests 310 }, # target_name: chromium_2010_builder_tests
319 ], 311 ],
320 'conditions': [ 312 'conditions': [
321 ['OS!="ios"', { 313 ['OS!="ios"', {
322 'targets': [ 314 'targets': [
323 { 315 {
316 'target_name': 'all_webkit',
317 'type': 'none',
318 'dependencies': [
319 '../third_party/WebKit/public/all.gyp:all_blink',
320 '../content/content.gyp:content_shell',
321 ],
322 }, # target_name: all_webkit
323 {
324 'target_name': 'chromium_builder_nacl_win_integration', 324 'target_name': 'chromium_builder_nacl_win_integration',
325 'type': 'none', 325 'type': 'none',
326 'dependencies': [ 326 'dependencies': [
327 'chromium_builder_qa', # needed for pyauto 327 'chromium_builder_qa', # needed for pyauto
328 'chromium_builder_tests', 328 'chromium_builder_tests',
329 ], 329 ],
330 }, # target_name: chromium_builder_nacl_win_integration 330 }, # target_name: chromium_builder_nacl_win_integration
331 { 331 {
332 'target_name': 'chromium_builder_perf', 332 'target_name': 'chromium_builder_perf',
333 'type': 'none', 333 'type': 'none',
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 '../chrome/chrome.gyp:interactive_ui_tests_run', 857 '../chrome/chrome.gyp:interactive_ui_tests_run',
858 '../chrome/chrome.gyp:sync_integration_tests_run', 858 '../chrome/chrome.gyp:sync_integration_tests_run',
859 '../chrome/chrome.gyp:unit_tests_run', 859 '../chrome/chrome.gyp:unit_tests_run',
860 '../net/net.gyp:net_unittests_run', 860 '../net/net.gyp:net_unittests_run',
861 ], 861 ],
862 }, # target_name: chromium_swarm_tests 862 }, # target_name: chromium_swarm_tests
863 ], 863 ],
864 }], 864 }],
865 ], # conditions 865 ], # conditions
866 } 866 }
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