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

Side by Side Diff: build/all.gyp

Issue 669203002: Removing unwanted targets from all for the Athena build target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« 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 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 }, { 91 }, {
92 'dependencies': [ 92 'dependencies': [
93 '../content/content_shell_and_tests.gyp:*', 93 '../content/content_shell_and_tests.gyp:*',
94 # TODO: This should build on Android and the target should move to t he list above. 94 # TODO: This should build on Android and the target should move to t he list above.
95 '../sync/sync.gyp:*', 95 '../sync/sync.gyp:*',
96 ], 96 ],
97 }], 97 }],
98 ['OS!="ios" and OS!="android"', { 98 ['OS!="ios" and OS!="android"', {
99 'dependencies': [ 99 'dependencies': [
100 '../third_party/re2/re2.gyp:re2', 100 '../third_party/re2/re2.gyp:re2',
101 '../chrome/chrome.gyp:*',
102 '../chrome/tools/profile_reset/jtl_compiler.gyp:*', 101 '../chrome/tools/profile_reset/jtl_compiler.gyp:*',
103 '../cc/blink/cc_blink_tests.gyp:*', 102 '../cc/blink/cc_blink_tests.gyp:*',
104 '../cc/cc_tests.gyp:*', 103 '../cc/cc_tests.gyp:*',
105 '../device/bluetooth/bluetooth.gyp:*', 104 '../device/bluetooth/bluetooth.gyp:*',
106 '../device/device_tests.gyp:*', 105 '../device/device_tests.gyp:*',
107 '../device/usb/usb.gyp:*', 106 '../device/usb/usb.gyp:*',
108 '../gin/gin.gyp:*', 107 '../gin/gin.gyp:*',
109 '../gpu/gpu.gyp:*', 108 '../gpu/gpu.gyp:*',
110 '../gpu/tools/tools.gyp:*', 109 '../gpu/tools/tools.gyp:*',
111 '../ipc/ipc.gyp:*', 110 '../ipc/ipc.gyp:*',
(...skipping 25 matching lines...) Expand all
137 '../third_party/ots/ots.gyp:*', 136 '../third_party/ots/ots.gyp:*',
138 '../third_party/pdfium/samples/samples.gyp:*', 137 '../third_party/pdfium/samples/samples.gyp:*',
139 '../third_party/qcms/qcms.gyp:*', 138 '../third_party/qcms/qcms.gyp:*',
140 '../tools/gn/gn.gyp:*', 139 '../tools/gn/gn.gyp:*',
141 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', 140 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
142 '../tools/telemetry/telemetry.gyp:*', 141 '../tools/telemetry/telemetry.gyp:*',
143 '../v8/tools/gyp/v8.gyp:*', 142 '../v8/tools/gyp/v8.gyp:*',
144 '<(libjpeg_gyp_path):*', 143 '<(libjpeg_gyp_path):*',
145 ], 144 ],
146 }], 145 }],
146 ['use_athena==1' , {
147 'dependencies': [
148 # Athena has to depend temporarily on Chrome. Since most tests do
sky 2014/10/22 17:24:11 Your statement is a bit confusing. I think you mea
Mr4D (OOO till 08-26) 2014/10/22 23:39:31 Done.
149 # not compile, we only include dependencies to tests we want to
150 # build.
151 '../chrome/chrome.gyp:chrome',
152 '../chrome/chrome.gyp:browser_tests',
153 ]
154 }],
sky 2014/10/22 17:24:12 Typically we use an else for this. See line 224 fo
Mr4D (OOO till 08-26) 2014/10/22 23:39:31 Wohow. that "syntax" is easy to miss. Done!
155 ['use_athena==0' , {
156 'dependencies': [
157 '../chrome/chrome.gyp:*',
158 ]
159 }],
147 ['OS=="mac" or OS=="ios" or OS=="win"', { 160 ['OS=="mac" or OS=="ios" or OS=="win"', {
148 'dependencies': [ 161 'dependencies': [
149 '../third_party/nss/nss.gyp:*', 162 '../third_party/nss/nss.gyp:*',
150 ], 163 ],
151 }], 164 }],
152 ['OS=="win" or OS=="ios" or OS=="linux"', { 165 ['OS=="win" or OS=="ios" or OS=="linux"', {
153 'dependencies': [ 166 'dependencies': [
154 '../breakpad/breakpad.gyp:*', 167 '../breakpad/breakpad.gyp:*',
155 ], 168 ],
156 }], 169 }],
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 '(syzyasan==1 or syzygy_optimize==1)', { 287 '(syzyasan==1 or syzygy_optimize==1)', {
275 'dependencies': [ 288 'dependencies': [
276 '../chrome/installer/mini_installer_syzygy.gyp:*', 289 '../chrome/installer/mini_installer_syzygy.gyp:*',
277 ], 290 ],
278 }], 291 }],
279 ], 292 ],
280 }, # target_name: All_syzygy 293 }, # target_name: All_syzygy
281 { 294 {
282 # Note: Android uses android_builder_tests below. 295 # Note: Android uses android_builder_tests below.
283 # TODO: Consider merging that with this target. 296 # TODO: Consider merging that with this target.
284 'target_name': 'chromium_builder_tests', 297 'target_name': 'chromium_builder_tests',
sky 2014/10/22 17:24:12 Are you sure you don't end up pulling in this targ
Mr4D (OOO till 08-26) 2014/10/22 23:39:31 In deed. Needed to do several rounds bout have fou
285 'type': 'none', 298 'type': 'none',
286 'dependencies': [ 299 'dependencies': [
287 '../base/base.gyp:base_unittests', 300 '../base/base.gyp:base_unittests',
288 '../components/components_tests.gyp:components_unittests', 301 '../components/components_tests.gyp:components_unittests',
289 '../crypto/crypto.gyp:crypto_unittests', 302 '../crypto/crypto.gyp:crypto_unittests',
290 '../net/net.gyp:net_unittests', 303 '../net/net.gyp:net_unittests',
291 '../sql/sql.gyp:sql_unittests', 304 '../sql/sql.gyp:sql_unittests',
292 '../sync/sync.gyp:sync_unit_tests', 305 '../sync/sync.gyp:sync_unit_tests',
293 '../ui/base/ui_base_tests.gyp:ui_base_unittests', 306 '../ui/base/ui_base_tests.gyp:ui_base_unittests',
294 '../ui/base/ui_base_tests.gyp:ui_unittests', 307 '../ui/base/ui_base_tests.gyp:ui_unittests',
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 'dependencies': [ 1344 'dependencies': [
1332 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1345 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1333 '../ui/views/views.gyp:views', 1346 '../ui/views/views.gyp:views',
1334 '../ui/views/views.gyp:views_unittests', 1347 '../ui/views/views.gyp:views_unittests',
1335 ], 1348 ],
1336 }, # target_name: macviews_builder 1349 }, # target_name: macviews_builder
1337 ], # targets 1350 ], # targets
1338 }], # os=='mac' and toolkit_views==1 1351 }], # os=='mac' and toolkit_views==1
1339 ], # conditions 1352 ], # conditions
1340 } 1353 }
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