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

Side by Side Diff: build/common.gypi

Issue 660783004: Don't require Mac 10.6 SDK for official iOS builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: swap if/else condition to ensure we only affect ios 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 # 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 1575 matching lines...) Expand 10 before | Expand all | Expand 10 after
1586 'enable_web_speech%': 0, 1586 'enable_web_speech%': 0,
1587 'use_system_libxml%': 1, 1587 'use_system_libxml%': 1,
1588 'use_system_sqlite%': 1, 1588 'use_system_sqlite%': 1,
1589 'locales==': [ 1589 'locales==': [
1590 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX', 1590 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX',
1591 'fi', 'fr', 'he', 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 1591 'fi', 'fr', 'he', 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms',
1592 'nb', 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 1592 'nb', 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr',
1593 'uk', 'vi', 'zh-CN', 'zh-TW', 1593 'uk', 'vi', 'zh-CN', 'zh-TW',
1594 ], 1594 ],
1595 1595
1596 # The Mac SDK is set for iOS builds and passed through to Mac
1597 # sub-builds. This allows the Mac sub-build SDK in an iOS build to be
1598 # overridden from the command line the same way it is for a Mac build.
1599 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)',
1600
1601 # iOS SDK and deployment target support. The |ios_sdk| value is left 1596 # iOS SDK and deployment target support. The |ios_sdk| value is left
1602 # blank so that when it is set in the project files it will be the 1597 # blank so that when it is set in the project files it will be the
1603 # "current" iOS SDK. Forcing a specific SDK even if it is "current" 1598 # "current" iOS SDK. Forcing a specific SDK even if it is "current"
1604 # causes Xcode to spit out a warning for every single project file for 1599 # causes Xcode to spit out a warning for every single project file for
1605 # not using the "current" SDK. 1600 # not using the "current" SDK.
1606 'ios_sdk%': '', 1601 'ios_sdk%': '',
1607 'ios_sdk_path%': '', 1602 'ios_sdk_path%': '',
1608 'ios_deployment_target%': '7.0', 1603 'ios_deployment_target%': '7.0',
1609 1604
1610 'conditions': [ 1605 'conditions': [
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1831 # Chrome normally builds with the Mac OS X 10.6 SDK and sets the 1826 # Chrome normally builds with the Mac OS X 10.6 SDK and sets the
1832 # deployment target to 10.6. Other projects, such as O3D, may 1827 # deployment target to 10.6. Other projects, such as O3D, may
1833 # override these defaults. 1828 # override these defaults.
1834 1829
1835 # Normally, mac_sdk_min is used to find an SDK that Xcode knows 1830 # Normally, mac_sdk_min is used to find an SDK that Xcode knows
1836 # about that is at least the specified version. In official builds, 1831 # about that is at least the specified version. In official builds,
1837 # the SDK must match mac_sdk_min exactly. If the SDK is installed 1832 # the SDK must match mac_sdk_min exactly. If the SDK is installed
1838 # someplace that Xcode doesn't know about, set mac_sdk_path to the 1833 # someplace that Xcode doesn't know about, set mac_sdk_path to the
1839 # path to the SDK; when set to a non-empty string, SDK detection 1834 # path to the SDK; when set to a non-empty string, SDK detection
1840 # based on mac_sdk_min will be bypassed entirely. 1835 # based on mac_sdk_min will be bypassed entirely.
1841 'mac_sdk_min%': '10.6', 1836 'conditions': [
1837 ['OS=="ios"', {
1838 'mac_sdk_min%': '10.8',
1839 }, { # else OS!="ios"
1840 'mac_sdk_min%': '10.6',
1841 }],
1842 ],
1842 'mac_sdk_path%': '', 1843 'mac_sdk_path%': '',
1843 1844
1844 'mac_deployment_target%': '10.6', 1845 'mac_deployment_target%': '10.6',
1845 }, 1846 },
1846 1847
1847 'mac_sdk_min': '<(mac_sdk_min)', 1848 'mac_sdk_min': '<(mac_sdk_min)',
1848 'mac_sdk_path': '<(mac_sdk_path)', 1849 'mac_sdk_path': '<(mac_sdk_path)',
1849 'mac_deployment_target': '<(mac_deployment_target)', 1850 'mac_deployment_target': '<(mac_deployment_target)',
1850 1851
1851 # Compile in Breakpad support by default so that it can be 1852 # Compile in Breakpad support by default so that it can be
1852 # tested, even if it is not enabled by default at runtime. 1853 # tested, even if it is not enabled by default at runtime.
1853 'mac_breakpad_compiled_in%': 1, 1854 'mac_breakpad_compiled_in%': 1,
1854 'conditions': [ 1855 'conditions': [
1855 # mac_product_name is set to the name of the .app bundle as it should 1856 # mac_product_name is set to the name of the .app bundle as it should
1856 # appear on disk. This duplicates data from 1857 # appear on disk. This duplicates data from
1857 # chrome/app/theme/chromium/BRANDING and 1858 # chrome/app/theme/chromium/BRANDING and
1858 # chrome/app/theme/google_chrome/BRANDING, but is necessary to get 1859 # chrome/app/theme/google_chrome/BRANDING, but is necessary to get
1859 # these names into the build system. 1860 # these names into the build system.
1860 ['branding=="Chrome"', { 1861 ['branding=="Chrome"', {
1861 'mac_product_name%': 'Google Chrome', 1862 'mac_product_name%': 'Google Chrome',
1862 }, { # else: branding!="Chrome" 1863 }, { # else: branding!="Chrome"
1863 'mac_product_name%': 'Chromium', 1864 'mac_product_name%': 'Chromium',
1864 }], 1865 }],
1865 1866 # Official mac builds require a specific OS X SDK, but iOS and
1867 # non-official mac builds do not.
1868 ['branding=="Chrome" and buildtype=="Official" and OS==mac', {
xhwang 2014/10/16 16:55:24 This should be OS=="mac". It's causing failures,
1869 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py --verify <(mac _sdk_min) --sdk_path=<(mac_sdk_path))',
1870 }, {
1871 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py <(mac_sdk_min) )',
1872 }],
1866 ['branding=="Chrome" and buildtype=="Official"', { 1873 ['branding=="Chrome" and buildtype=="Official"', {
1867 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py --verify <(mac _sdk_min) --sdk_path=<(mac_sdk_path))',
1868 # Enable uploading crash dumps. 1874 # Enable uploading crash dumps.
1869 'mac_breakpad_uploads%': 1, 1875 'mac_breakpad_uploads%': 1,
1870 # Enable dumping symbols at build time for use by Mac Breakpad. 1876 # Enable dumping symbols at build time for use by Mac Breakpad.
1871 'mac_breakpad%': 1, 1877 'mac_breakpad%': 1,
1872 # Enable Keystone auto-update support. 1878 # Enable Keystone auto-update support.
1873 'mac_keystone%': 1, 1879 'mac_keystone%': 1,
1874 }, { # else: branding!="Chrome" or buildtype!="Official" 1880 }, { # else: branding!="Chrome" or buildtype!="Official"
1875 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py <(mac_sdk_min) )',
1876 'mac_breakpad_uploads%': 0, 1881 'mac_breakpad_uploads%': 0,
1877 'mac_breakpad%': 0, 1882 'mac_breakpad%': 0,
1878 'mac_keystone%': 0, 1883 'mac_keystone%': 0,
1879 }], 1884 }],
1880 ], 1885 ],
1881 }], # OS=="mac" or OS=="ios" 1886 }], # OS=="mac" or OS=="ios"
1882 ['OS=="win"', { 1887 ['OS=="win"', {
1883 'conditions': [ 1888 'conditions': [
1884 # This is the architecture convention used in WinSDK paths. 1889 # This is the architecture convention used in WinSDK paths.
1885 ['target_arch=="ia32"', { 1890 ['target_arch=="ia32"', {
(...skipping 3849 matching lines...) Expand 10 before | Expand all | Expand 10 after
5735 # settings in target dicts. SYMROOT is a special case, because many other 5740 # settings in target dicts. SYMROOT is a special case, because many other
5736 # Xcode variables depend on it, including variables such as 5741 # Xcode variables depend on it, including variables such as
5737 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5742 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5738 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5743 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5739 # files to appear (when present) in the UI as actual files and not red 5744 # files to appear (when present) in the UI as actual files and not red
5740 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5745 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5741 # and therefore SYMROOT, needs to be set at the project level. 5746 # and therefore SYMROOT, needs to be set at the project level.
5742 'SYMROOT': '<(DEPTH)/xcodebuild', 5747 'SYMROOT': '<(DEPTH)/xcodebuild',
5743 }, 5748 },
5744 } 5749 }
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