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

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

Issue 1686373002: Allow WebRTC to require Mac 10.7 deployments in GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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_overrides/webrtc.gni » ('j') | build_overrides/webrtc.gni » ('J')
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.
8 # We can drop the rtc_require_mac_10_7_deployment flag when Chromium
9 # also requires a 10.7 deployment target.
10 import("//build_overrides/webrtc.gni")
brettw 2016/02/16 22:46:46 We're trying to make the build directory independe
11
7 declare_args() { 12 declare_args() {
8 # Minimum supported version of the Mac SDK. 13 # Minimum supported version of the Mac SDK.
9 mac_sdk_min = "10.10" 14 mac_sdk_min = "10.10"
10 15
11 # Minimum supported version of OSX. 16 # Minimum supported version of OSX.
12 mac_deployment_target = "10.6" 17 if (rtc_require_mac_10_7_deployment) {
18 mac_deployment_target = "10.7"
19 } else {
20 mac_deployment_target = "10.6"
21 }
13 22
14 # Path to a specific version of the Mac SDK, not including a backslash at 23 # Path to a specific version of the Mac SDK, not including a backslash at
15 # the end. If empty, the path to the lowest version greater than or equal to 24 # the end. If empty, the path to the lowest version greater than or equal to
16 # mac_sdk_min is used. 25 # mac_sdk_min is used.
17 mac_sdk_path = "" 26 mac_sdk_path = ""
18 } 27 }
19 28
20 find_sdk_args = [ "--print_sdk_path" ] 29 find_sdk_args = [ "--print_sdk_path" ]
21 if (is_chrome_branded && is_official_build) { 30 if (is_chrome_branded && is_official_build) {
22 find_sdk_args += [ 31 find_sdk_args += [
23 "--verify", 32 "--verify",
24 mac_sdk_min, 33 mac_sdk_min,
25 "--sdk_path=" + mac_sdk_path, 34 "--sdk_path=" + mac_sdk_path,
26 ] 35 ]
27 } else { 36 } else {
28 find_sdk_args += [ mac_sdk_min ] 37 find_sdk_args += [ mac_sdk_min ]
29 } 38 }
30 39
31 # The tool will print the SDK path on the first line, and the version on the 40 # The tool will print the SDK path on the first line, and the version on the
32 # second line. 41 # second line.
33 find_sdk_lines = 42 find_sdk_lines =
34 exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines") 43 exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines")
35 mac_sdk_version = find_sdk_lines[1] 44 mac_sdk_version = find_sdk_lines[1]
36 if (mac_sdk_path == "") { 45 if (mac_sdk_path == "") {
37 mac_sdk_path = find_sdk_lines[0] 46 mac_sdk_path = find_sdk_lines[0]
38 } 47 }
OLDNEW
« no previous file with comments | « no previous file | build_overrides/webrtc.gni » ('j') | build_overrides/webrtc.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698