| OLD | NEW | 
|---|
| 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") |  | 
| 6 |  | 
| 7 declare_args() { | 5 declare_args() { | 
| 8   # Minimum supported version of the Mac SDK. | 6   # Minimum supported version of the Mac SDK. | 
| 9   mac_sdk_min = "10.8" | 7   mac_sdk_min = "10.8" | 
| 10 | 8 | 
| 11   # Path to a specific version of the Mac SDKJ, not including a backslash at | 9   # Path to a specific version of the Mac SDKJ, not including a backslash at | 
| 12   # the end. If empty, the path to the lowest version greater than or equal to | 10   # the end. If empty, the path to the lowest version greater than or equal to | 
| 13   # mac_sdk_min is used. | 11   # mac_sdk_min is used. | 
| 14   mac_sdk_path = "" | 12   mac_sdk_path = "" | 
| 15 } | 13 } | 
| 16 | 14 | 
| 17 find_sdk_args = [ "--print_sdk_path" ] | 15 find_sdk_args = [ "--print_sdk_path", mac_sdk_min ] | 
| 18 if (is_chrome_branded && is_official_build) { |  | 
| 19   find_sdk_args += [ |  | 
| 20     "--verify", |  | 
| 21     mac_sdk_min, |  | 
| 22     "--sdk_path=" + mac_sdk_path, |  | 
| 23   ] |  | 
| 24 } else { |  | 
| 25   find_sdk_args += [ mac_sdk_min ] |  | 
| 26 } |  | 
| 27 | 16 | 
| 28 # The tool will print the SDK path on the first line, and the version on the | 17 # The tool will print the SDK path on the first line, and the version on the | 
| 29 # second line. | 18 # second line. | 
| 30 find_sdk_lines = | 19 find_sdk_lines = | 
| 31     exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines") | 20     exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines") | 
| 32 mac_sdk_version = find_sdk_lines[1] | 21 mac_sdk_version = find_sdk_lines[1] | 
| 33 if (mac_sdk_path == "") { | 22 if (mac_sdk_path == "") { | 
| 34   # TODO(brettw) http://crbug.com/335325  when everybody moves to XCode 5 we | 23   # TODO(brettw) http://crbug.com/335325  when everybody moves to XCode 5 we | 
| 35   # can remove the --print_sdk_path argument to find_sdk and instead just use | 24   # can remove the --print_sdk_path argument to find_sdk and instead just use | 
| 36   # the following two lines to get the path. Although it looks longer here, it | 25   # the following two lines to get the path. Although it looks longer here, it | 
| 37   # saves forking a process in find_sdk.py so will be faster. | 26   # saves forking a process in find_sdk.py so will be faster. | 
| 38   #mac_sdk_root = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p
    latform/Developer/SDKs/MacOSX" | 27   #mac_sdk_root = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p
    latform/Developer/SDKs/MacOSX" | 
| 39   #mac_sdk_path = mac_sdk_root + mac_sdk_version + ".sdk" | 28   #mac_sdk_path = mac_sdk_root + mac_sdk_version + ".sdk" | 
| 40   mac_sdk_path = find_sdk_lines[0] | 29   mac_sdk_path = find_sdk_lines[0] | 
| 41 } | 30 } | 
| OLD | NEW | 
|---|