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

Side by Side Diff: build/common.gypi

Issue 1257643005: Reland #1: Switch the default build configuration to use the 10.10 SDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | build/config/mac/mac_sdk.gni » ('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 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 # Normally, mac_sdk_min is used to find an SDK that Xcode knows 1894 # Normally, mac_sdk_min is used to find an SDK that Xcode knows
1895 # about that is at least the specified version. In official builds, 1895 # about that is at least the specified version. In official builds,
1896 # the SDK must match mac_sdk_min exactly. If the SDK is installed 1896 # the SDK must match mac_sdk_min exactly. If the SDK is installed
1897 # someplace that Xcode doesn't know about, set mac_sdk_path to the 1897 # someplace that Xcode doesn't know about, set mac_sdk_path to the
1898 # path to the SDK; when set to a non-empty string, SDK detection 1898 # path to the SDK; when set to a non-empty string, SDK detection
1899 # based on mac_sdk_min will be bypassed entirely. 1899 # based on mac_sdk_min will be bypassed entirely.
1900 'conditions': [ 1900 'conditions': [
1901 ['OS=="ios"', { 1901 ['OS=="ios"', {
1902 'mac_sdk_min%': '10.8', 1902 'mac_sdk_min%': '10.8',
1903 }, { # else OS!="ios" 1903 }, { # else OS!="ios"
1904 'mac_sdk_min%': '10.6', 1904 'mac_sdk_min%': '10.10',
1905 }], 1905 }],
1906 ], 1906 ],
1907 'mac_sdk_path%': '', 1907 'mac_sdk_path%': '',
1908 1908
1909 'mac_deployment_target%': '10.6', 1909 'mac_deployment_target%': '10.6',
1910 }, 1910 },
1911 1911
1912 'mac_sdk_min': '<(mac_sdk_min)', 1912 'mac_sdk_min': '<(mac_sdk_min)',
1913 'mac_sdk_path': '<(mac_sdk_path)', 1913 'mac_sdk_path': '<(mac_sdk_path)',
1914 'mac_deployment_target': '<(mac_deployment_target)', 1914 'mac_deployment_target': '<(mac_deployment_target)',
(...skipping 4368 matching lines...) Expand 10 before | Expand all | Expand 10 after
6283 # settings in target dicts. SYMROOT is a special case, because many other 6283 # settings in target dicts. SYMROOT is a special case, because many other
6284 # Xcode variables depend on it, including variables such as 6284 # Xcode variables depend on it, including variables such as
6285 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6285 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6286 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6286 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6287 # files to appear (when present) in the UI as actual files and not red 6287 # files to appear (when present) in the UI as actual files and not red
6288 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6288 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6289 # and therefore SYMROOT, needs to be set at the project level. 6289 # and therefore SYMROOT, needs to be set at the project level.
6290 'SYMROOT': '<(DEPTH)/xcodebuild', 6290 'SYMROOT': '<(DEPTH)/xcodebuild',
6291 }, 6291 },
6292 } 6292 }
OLDNEW
« no previous file with comments | « no previous file | build/config/mac/mac_sdk.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698