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

Side by Side Diff: trunk/src/build/common.gypi

Issue 473883002: Revert 289403 "Update iOS deployment target to 7.0" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/ui/gfx/platform_font_ios.mm » ('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 # 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 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 # overridden from the command line the same way it is for a Mac build. 1611 # overridden from the command line the same way it is for a Mac build.
1612 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)', 1612 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)',
1613 1613
1614 # iOS SDK and deployment target support. The |ios_sdk| value is left 1614 # iOS SDK and deployment target support. The |ios_sdk| value is left
1615 # blank so that when it is set in the project files it will be the 1615 # blank so that when it is set in the project files it will be the
1616 # "current" iOS SDK. Forcing a specific SDK even if it is "current" 1616 # "current" iOS SDK. Forcing a specific SDK even if it is "current"
1617 # causes Xcode to spit out a warning for every single project file for 1617 # causes Xcode to spit out a warning for every single project file for
1618 # not using the "current" SDK. 1618 # not using the "current" SDK.
1619 'ios_sdk%': '', 1619 'ios_sdk%': '',
1620 'ios_sdk_path%': '', 1620 'ios_sdk_path%': '',
1621 'ios_deployment_target%': '7.0', 1621 'ios_deployment_target%': '6.0',
1622 1622
1623 'conditions': [ 1623 'conditions': [
1624 # ios_product_name is set to the name of the .app bundle as it should 1624 # ios_product_name is set to the name of the .app bundle as it should
1625 # appear on disk. 1625 # appear on disk.
1626 ['branding=="Chrome"', { 1626 ['branding=="Chrome"', {
1627 'ios_product_name%': 'Chrome', 1627 'ios_product_name%': 'Chrome',
1628 }, { # else: branding!="Chrome" 1628 }, { # else: branding!="Chrome"
1629 'ios_product_name%': 'Chromium', 1629 'ios_product_name%': 'Chromium',
1630 }], 1630 }],
1631 ['branding=="Chrome" and buildtype=="Official"', { 1631 ['branding=="Chrome" and buildtype=="Official"', {
(...skipping 3381 matching lines...) Expand 10 before | Expand all | Expand 10 after
5013 }], 5013 }],
5014 ['use_system_libcxx==1', { 5014 ['use_system_libcxx==1', {
5015 'target_conditions': [ 5015 'target_conditions': [
5016 # Only use libc++ when building target for iOS not when building 5016 # Only use libc++ when building target for iOS not when building
5017 # tools for the host (OS X) as Mac targets OS X SDK 10.6 which 5017 # tools for the host (OS X) as Mac targets OS X SDK 10.6 which
5018 # does not support libc++. 5018 # does not support libc++.
5019 ['_toolset=="target"', { 5019 ['_toolset=="target"', {
5020 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ 5020 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++
5021 }] 5021 }]
5022 ], 5022 ],
5023 }, {
5024 # The default for deployment target of 7.0+ is libc++, so force
5025 # the old behavior unless libc++ is enabled.
5026 'CLANG_CXX_LIBRARY': 'libstdc++', # -stdlib=libstdc++
5027 }], 5023 }],
5028 ], 5024 ],
5029 }, 5025 },
5030 'target_conditions': [ 5026 'target_conditions': [
5031 ['_toolset=="host"', { 5027 ['_toolset=="host"', {
5032 'xcode_settings': { 5028 'xcode_settings': {
5033 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot 5029 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
5034 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', 5030 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
5035 'VALID_ARCHS': [ 5031 'VALID_ARCHS': [
5036 'x86_64', 5032 'x86_64',
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
5662 # settings in target dicts. SYMROOT is a special case, because many other 5658 # settings in target dicts. SYMROOT is a special case, because many other
5663 # Xcode variables depend on it, including variables such as 5659 # Xcode variables depend on it, including variables such as
5664 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5660 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5665 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5661 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5666 # files to appear (when present) in the UI as actual files and not red 5662 # files to appear (when present) in the UI as actual files and not red
5667 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5663 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5668 # and therefore SYMROOT, needs to be set at the project level. 5664 # and therefore SYMROOT, needs to be set at the project level.
5669 'SYMROOT': '<(DEPTH)/xcodebuild', 5665 'SYMROOT': '<(DEPTH)/xcodebuild',
5670 }, 5666 },
5671 } 5667 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/ui/gfx/platform_font_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698