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

Side by Side Diff: build/config/mac/mac_sdk.gni

Issue 2225203003: [iOS] Fix compilation of official build with Xcode 8. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 6
7 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453. 7 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453.
8 # We can drop the rtc_require_mac_10_7_deployment flag when Chromium 8 # We can drop the rtc_require_mac_10_7_deployment flag when Chromium
9 # also requires a 10.7 deployment target. 9 # also requires a 10.7 deployment target.
10 import("//build_overrides/build.gni") 10 import("//build_overrides/build.gni")
11 11
12 declare_args() { 12 declare_args() {
13 # Minimum supported version of the Mac SDK. 13 # Minimum supported version of the Mac SDK.
14 mac_sdk_min = mac_sdk_min_build_override 14 mac_sdk_min = mac_sdk_min_build_override
15 15
16 # Minimum supported version of OSX. 16 # Minimum supported version of OSX.
17 mac_deployment_target = mac_deployment_target_build_override 17 mac_deployment_target = mac_deployment_target_build_override
18 18
19 # Path to a specific version of the Mac SDK, not including a backslash at 19 # Path to a specific version of the Mac SDK, not including a backslash at
20 # the end. If empty, the path to the lowest version greater than or equal to 20 # the end. If empty, the path to the lowest version greater than or equal to
21 # mac_sdk_min is used. 21 # mac_sdk_min is used.
22 mac_sdk_path = "" 22 mac_sdk_path = ""
23 23
24 # The SDK name as accepted by xcodebuild. 24 # The SDK name as accepted by xcodebuild.
25 mac_sdk_name = "macosx" 25 mac_sdk_name = "macosx"
26 } 26 }
27 27
28 _verify_sdk = is_chrome_branded && is_official_build &&
29 current_toolchain != host_toolchain
Dirk Pranke 2016/08/08 23:15:06 I know we discussed this a bit back and forth over
sdefresne 2016/08/08 23:21:27 The issue is that Chrome on iOS wants to soon requ
Dirk Pranke 2016/08/08 23:36:28 Change to current_toolchain == default_toolchain,
30
28 find_sdk_args = [ "--print_sdk_path" ] 31 find_sdk_args = [ "--print_sdk_path" ]
29 if (is_chrome_branded && is_official_build) { 32 if (_verify_sdk) {
30 find_sdk_args += [ 33 find_sdk_args += [
31 "--verify", 34 "--verify",
32 mac_sdk_min, 35 mac_sdk_min,
33 "--sdk_path=" + mac_sdk_path, 36 "--sdk_path=" + mac_sdk_path,
34 ] 37 ]
35 } else { 38 } else {
36 find_sdk_args += [ mac_sdk_min ] 39 find_sdk_args += [ mac_sdk_min ]
37 } 40 }
38 41
39 # The tool will print the SDK path on the first line, and the version on the 42 # The tool will print the SDK path on the first line, and the version on the
(...skipping 29 matching lines...) Expand all
69 " either upgrade Xcode to the latest version or install the Mac O S X") 72 " either upgrade Xcode to the latest version or install the Mac O S X")
70 print( 73 print(
71 " $mac_sdk_min_build_override SDK. For more information, see http s://crbug.com/620127.") 74 " $mac_sdk_min_build_override SDK. For more information, see http s://crbug.com/620127.")
72 print() 75 print()
73 print(" Current SDK Version: $mac_sdk_version") 76 print(" Current SDK Version: $mac_sdk_version")
74 print(" Current Xcode Version: $xcode_version ($xcode_build)") 77 print(" Current Xcode Version: $xcode_version ($xcode_build)")
75 print( 78 print(
76 "************************************************************************* *******") 79 "************************************************************************* *******")
77 assert(false, "SDK is incompatible with Xcode") 80 assert(false, "SDK is incompatible with Xcode")
78 } 81 }
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