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

Side by Side Diff: build/common.gypi

Issue 22384004: Change deployment target for iOS to 6.0 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: update comment based on review feedback: Created 7 years, 4 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb', 'nl', 1171 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb', 'nl',
1172 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 'vi', 1172 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 'vi',
1173 'zh-CN', 'zh-TW', 1173 'zh-CN', 'zh-TW',
1174 ], 1174 ],
1175 1175
1176 # The Mac SDK is set for iOS builds and passed through to Mac 1176 # The Mac SDK is set for iOS builds and passed through to Mac
1177 # sub-builds. This allows the Mac sub-build SDK in an iOS build to be 1177 # sub-builds. This allows the Mac sub-build SDK in an iOS build to be
1178 # overridden from the command line the same way it is for a Mac build. 1178 # overridden from the command line the same way it is for a Mac build.
1179 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)', 1179 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)',
1180 1180
1181 # iOS SDK and deployment target support. The iOS 5.0 SDK is actually 1181 # iOS SDK and deployment target support. The |ios_sdk| value is left
1182 # what is required, but the value is left blank so when it is set in 1182 # blank so that when it is set in the project files it will be the
1183 # the project files it will be the "current" iOS SDK. Forcing 5.0 1183 # "current" iOS SDK. Forcing a specific SDK even if it is "current"
1184 # even though it is "current" causes Xcode to spit out a warning for 1184 # causes Xcode to spit out a warning for every single project file for
1185 # every single project file for not using the "current" SDK. 1185 # not using the "current" SDK.
1186 'ios_sdk%': '', 1186 'ios_sdk%': '',
1187 'ios_sdk_path%': '', 1187 'ios_sdk_path%': '',
1188 'ios_deployment_target%': '5.0', 1188 'ios_deployment_target%': '6.0',
1189 1189
1190 'conditions': [ 1190 'conditions': [
1191 # ios_product_name is set to the name of the .app bundle as it should 1191 # ios_product_name is set to the name of the .app bundle as it should
1192 # appear on disk. 1192 # appear on disk.
1193 ['branding=="Chrome"', { 1193 ['branding=="Chrome"', {
1194 'ios_product_name%': 'Chrome', 1194 'ios_product_name%': 'Chrome',
1195 }, { # else: branding!="Chrome" 1195 }, { # else: branding!="Chrome"
1196 'ios_product_name%': 'Chromium', 1196 'ios_product_name%': 'Chromium',
1197 }], 1197 }],
1198 ['branding=="Chrome" and buildtype=="Official"', { 1198 ['branding=="Chrome" and buildtype=="Official"', {
(...skipping 3488 matching lines...) Expand 10 before | Expand all | Expand 10 after
4687 # settings in target dicts. SYMROOT is a special case, because many other 4687 # settings in target dicts. SYMROOT is a special case, because many other
4688 # Xcode variables depend on it, including variables such as 4688 # Xcode variables depend on it, including variables such as
4689 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4689 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4690 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4690 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4691 # files to appear (when present) in the UI as actual files and not red 4691 # files to appear (when present) in the UI as actual files and not red
4692 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4692 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4693 # and therefore SYMROOT, needs to be set at the project level. 4693 # and therefore SYMROOT, needs to be set at the project level.
4694 'SYMROOT': '<(DEPTH)/xcodebuild', 4694 'SYMROOT': '<(DEPTH)/xcodebuild',
4695 }, 4695 },
4696 } 4696 }
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