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