Chromium Code Reviews| Index: build/config/ios/ios_sdk.gni |
| diff --git a/build/config/ios/ios_sdk.gni b/build/config/ios/ios_sdk.gni |
| index bf1540c11c9f62f93730e519b1a71676211e2945..2d54a5c5b2cdb5d56c34acef6495ab7d8085b436 100644 |
| --- a/build/config/ios/ios_sdk.gni |
| +++ b/build/config/ios/ios_sdk.gni |
| @@ -6,6 +6,12 @@ declare_args() { |
| # SDK path to use. When empty this will use the default SDK based on the |
| # value of use_ios_simulator. |
| ios_sdk_path = "" |
| + ios_sdk_name = "" |
| + ios_sdk_version = "" |
| + ios_sdk_platform = "" |
| + xcode_version = "" |
| + xcode_build = "" |
| + machine_os_build = "" |
| use_ios_simulator = target_cpu == "x86" || target_cpu == "x64" |
| @@ -22,13 +28,26 @@ declare_args() { |
| if (ios_sdk_path == "") { |
| # Compute default target. |
| if (use_ios_simulator) { |
| - _ios_sdk_to_query = "iphonesimulator" |
| + ios_sdk_name = "iphonesimulator" |
| + ios_sdk_platform = "iPhoneSimulator" |
| } else { |
| - _ios_sdk_to_query = "iphoneos" |
| + ios_sdk_name = "iphoneos" |
| + ios_sdk_platform = "iPhoneOS" |
| + } |
| + _ios_sdk_result = exec_script("ios_sdk.py", [ ios_sdk_name ], "scope") |
| + ios_sdk_path = _ios_sdk_result.ios_sdk_path |
| + ios_sdk_version = _ios_sdk_result.ios_sdk_version |
| + ios_sdk_build = _ios_sdk_result.ios_sdk_build |
| + xcode_version = _ios_sdk_result.xcode_version |
| + xcode_build = _ios_sdk_result.xcode_build |
| + machine_os_build = _ios_sdk_result.machine_os_build |
| + if (use_ios_simulator) { |
| + # This is weird, but Xcode set DTPlatformBuild to an empty field for |
|
Dirk Pranke
2016/03/01 23:56:30
s/set/sets ...
sdefresne
2016/03/11 17:57:12
Done.
|
| + # simulator builds. |
| + ios_platform_build = "" |
| + } else { |
| + ios_platform_build = ios_sdk_build |
| } |
| - _ios_sdk_result = |
| - exec_script("ios_sdk.py", [ _ios_sdk_to_query ], "list lines") |
| - ios_sdk_path = _ios_sdk_result[0] |
| } |
| if (use_ios_simulator) { |