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

Side by Side Diff: chrome/chrome.gyp

Issue 140823002: Enable building with configuration_policy==1 on ios. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « build/ios/grit_whitelist.txt ('k') | chrome/chrome_browser.gypi » ('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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 }, 1008 },
1009 'includes': [ 1009 'includes': [
1010 '../build/java.gypi', 1010 '../build/java.gypi',
1011 ], 1011 ],
1012 }, 1012 },
1013 ], # 'targets' 1013 ], # 'targets'
1014 'includes': [ 1014 'includes': [
1015 'chrome_android.gypi', 1015 'chrome_android.gypi',
1016 ]}, # 'includes' 1016 ]}, # 'includes'
1017 ], # OS=="android" 1017 ], # OS=="android"
1018 ['configuration_policy==1 and OS!="android"', { 1018 ['configuration_policy==1 and OS!="android" and OS!="ios"', {
1019 'includes': [ 'policy.gypi', ], 1019 'includes': [ 'policy.gypi', ],
1020 }], 1020 }],
1021 ['enable_printing==1', { 1021 ['enable_printing==1', {
1022 'targets': [ 1022 'targets': [
1023 { 1023 {
1024 'target_name': 'service', 1024 'target_name': 'service',
1025 'type': 'static_library', 1025 'type': 'static_library',
1026 'variables': { 'enable_wexit_time_destructors': 1, }, 1026 'variables': { 'enable_wexit_time_destructors': 1, },
1027 'dependencies': [ 1027 'dependencies': [
1028 'chrome_resources.gyp:chrome_strings', 1028 'chrome_resources.gyp:chrome_strings',
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 'sources': [ 1105 'sources': [
1106 'service/cloud_print/print_system_dummy.cc', 1106 'service/cloud_print/print_system_dummy.cc',
1107 ], 1107 ],
1108 }], 1108 }],
1109 ], 1109 ],
1110 }, 1110 },
1111 ], 1111 ],
1112 }], 1112 }],
1113 ], # 'conditions' 1113 ], # 'conditions'
1114 } 1114 }
OLDNEW
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698