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

Side by Side Diff: build/all.gyp

Issue 10389196: Adding base_untrusted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 6 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
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,
11 'dependencies': [ 11 'dependencies': [
12 'some.gyp:*', 12 'some.gyp:*',
13 '../base/base.gyp:*', 13 '../base/base.gyp:*',
14 '../base/base_untrusted.gyp:*',
14 '../chrome/chrome.gyp:*', 15 '../chrome/chrome.gyp:*',
15 '../content/content.gyp:*', 16 '../content/content.gyp:*',
16 '../crypto/crypto.gyp:*', 17 '../crypto/crypto.gyp:*',
17 '../ui/ui.gyp:*', 18 '../ui/ui.gyp:*',
18 '../gpu/gpu.gyp:*', 19 '../gpu/gpu.gyp:*',
19 '../gpu/tools/tools.gyp:*', 20 '../gpu/tools/tools.gyp:*',
20 '../ipc/ipc.gyp:*', 21 '../ipc/ipc.gyp:*',
21 '../jingle/jingle.gyp:*', 22 '../jingle/jingle.gyp:*',
22 '../media/media.gyp:*', 23 '../media/media.gyp:*',
23 '../net/net.gyp:*', 24 '../net/net.gyp:*',
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 '../chrome/chrome.gyp:browser_tests_run', 167 '../chrome/chrome.gyp:browser_tests_run',
167 '../chrome/chrome.gyp:unit_tests_run', 168 '../chrome/chrome.gyp:unit_tests_run',
168 '../net/net.gyp:net_unittests_run', 169 '../net/net.gyp:net_unittests_run',
169 ], 170 ],
170 }, # target_name: chromium_swarm_tests 171 }, # target_name: chromium_swarm_tests
171 { 172 {
172 'target_name': 'chromium_builder_tests', 173 'target_name': 'chromium_builder_tests',
173 'type': 'none', 174 'type': 'none',
174 'dependencies': [ 175 'dependencies': [
175 '../base/base.gyp:base_unittests', 176 '../base/base.gyp:base_unittests',
177 # TODO(bbudge): drop this when something meaningful depends on
178 # base_untrusted.
179 '../base/base_untrusted.gyp:base_untrusted',
176 '../chrome/chrome.gyp:browser_tests', 180 '../chrome/chrome.gyp:browser_tests',
177 '../chrome/chrome.gyp:interactive_ui_tests', 181 '../chrome/chrome.gyp:interactive_ui_tests',
178 '../chrome/chrome.gyp:safe_browsing_tests', 182 '../chrome/chrome.gyp:safe_browsing_tests',
179 '../chrome/chrome.gyp:sync_integration_tests', 183 '../chrome/chrome.gyp:sync_integration_tests',
180 '../chrome/chrome.gyp:unit_tests', 184 '../chrome/chrome.gyp:unit_tests',
181 '../cloud_print/cloud_print.gyp:cloud_print_unittests', 185 '../cloud_print/cloud_print.gyp:cloud_print_unittests',
182 '../content/content.gyp:content_browsertests', 186 '../content/content.gyp:content_browsertests',
183 '../content/content.gyp:content_unittests', 187 '../content/content.gyp:content_unittests',
184 '../crypto/crypto.gyp:crypto_unittests', 188 '../crypto/crypto.gyp:crypto_unittests',
185 '../ui/ui.gyp:gfx_unittests', 189 '../ui/ui.gyp:gfx_unittests',
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 'dependencies': [ 613 'dependencies': [
610 '../chromeos/chromeos.gyp:chromeos_unittests', 614 '../chromeos/chromeos.gyp:chromeos_unittests',
611 ], 615 ],
612 }], 616 }],
613 ], 617 ],
614 }, 618 },
615 ], # targets 619 ], # targets
616 }], # "use_aura==1" 620 }], # "use_aura==1"
617 ], # conditions 621 ], # conditions
618 } 622 }
OLDNEW
« base/base.gypi ('K') | « base/base_untrusted.gyp ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698