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

Side by Side Diff: trunk/src/build/all.gyp

Issue 224963002: Revert 261559 "Create new app_shell.gyp for app_shell targets." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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 | « trunk/src/apps/shell/app_shell.gyp ('k') | trunk/src/extensions/extensions.gyp » ('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 '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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 ['enable_app_list==1', { 216 ['enable_app_list==1', {
217 'dependencies': [ 217 'dependencies': [
218 '../ui/app_list/app_list.gyp:*', 218 '../ui/app_list/app_list.gyp:*',
219 ], 219 ],
220 }], 220 }],
221 ['OS!="android" and OS!="ios"', { 221 ['OS!="android" and OS!="ios"', {
222 'dependencies': [ 222 'dependencies': [
223 '../google_apis/gcm/gcm.gyp:*', 223 '../google_apis/gcm/gcm.gyp:*',
224 ], 224 ],
225 }], 225 }],
226 ['chromeos==1 or (OS=="linux" and use_aura==1) or (OS=="win" and use_aur a==1)', {
227 'dependencies': [
228 '../apps/shell/app_shell.gyp:*',
229 ],
230 }],
231 ], 226 ],
232 }, # target_name: All 227 }, # target_name: All
233 { 228 {
234 'target_name': 'All_syzygy', 229 'target_name': 'All_syzygy',
235 'type': 'none', 230 'type': 'none',
236 'conditions': [ 231 'conditions': [
237 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and ' 232 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and '
238 '(syzyasan==1 or syzygy_optimize==1)', { 233 '(syzyasan==1 or syzygy_optimize==1)', {
239 'dependencies': [ 234 'dependencies': [
240 '../chrome/installer/mini_installer_syzygy.gyp:*', 235 '../chrome/installer/mini_installer_syzygy.gyp:*',
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 # http://crbug.com/157234 1230 # http://crbug.com/157234
1236 #'../chrome/chrome.gyp:sync_integration_tests_run', 1231 #'../chrome/chrome.gyp:sync_integration_tests_run',
1237 '../chrome/chrome.gyp:unit_tests_run', 1232 '../chrome/chrome.gyp:unit_tests_run',
1238 '../net/net.gyp:net_unittests_run', 1233 '../net/net.gyp:net_unittests_run',
1239 ], 1234 ],
1240 }, # target_name: chromium_swarm_tests 1235 }, # target_name: chromium_swarm_tests
1241 ], 1236 ],
1242 }], 1237 }],
1243 ], # conditions 1238 ], # conditions
1244 } 1239 }
OLDNEW
« no previous file with comments | « trunk/src/apps/shell/app_shell.gyp ('k') | trunk/src/extensions/extensions.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698