From a9cbe267748e0360f8c994a1c7209f86f33b944f Mon Sep 17 00:00:00 2001 From: erikchen Date: Tue, 11 Aug 2015 12:31:28 -0700 Subject: [PATCH] Reland #2: Switch the default build configuration to use the 10.10 SDK. The first reland caused Webkit layout test errors on 10.8 and 10.9. Those errors have been fixed. Original issue's description: > mac: Switch the default build configuration to use the 10.10 SDK. > > This change is intended to be temporary. The goal is to release a Canary > compiled against the 10.10 SDK, and then to revert this CL. > > BUG=463170 > > Committed: https://crrev.com/42ba22e0b8e87f758804537f64db23ff6438e451 > Cr-Commit-Position: refs/heads/master@{#340992} TBR=thakis@chromium.org,amineer@chromium.org BUG=463170, 515836 Review URL: https://codereview.chromium.org/1268803004 Cr-Commit-Position: refs/heads/master@{#342870} --- build/common.gypi | 2 +- build/config/mac/mac_sdk.gni | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common.gypi b/build/common.gypi index 4a555164666d..fbbc6169b459 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1926,7 +1926,7 @@ ['OS=="ios"', { 'mac_sdk_min%': '10.8', }, { # else OS!="ios" - 'mac_sdk_min%': '10.6', + 'mac_sdk_min%': '10.10', }], ], 'mac_sdk_path%': '', diff --git a/build/config/mac/mac_sdk.gni b/build/config/mac/mac_sdk.gni index 600085e8b7e1..3f551087018e 100644 --- a/build/config/mac/mac_sdk.gni +++ b/build/config/mac/mac_sdk.gni @@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni") declare_args() { # Minimum supported version of the Mac SDK. - mac_sdk_min = "10.6" + mac_sdk_min = "10.10" # Path to a specific version of the Mac SDKJ, not including a backslash at # the end. If empty, the path to the lowest version greater than or equal to -- 2.11.4.GIT