| Index: build/config/ios/ios_sdk.gni
|
| diff --git a/build/config/ios/ios_sdk.gni b/build/config/ios/ios_sdk.gni
|
| index 4b9c1e4c8ba70a8c5ffd46cf7f5014858124d24c..d7aa3071d5870a1b51cd7621b71aee076121d27e 100644
|
| --- a/build/config/ios/ios_sdk.gni
|
| +++ b/build/config/ios/ios_sdk.gni
|
| @@ -2,6 +2,8 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +import("//build/toolchain/toolchain.gni")
|
| +
|
| declare_args() {
|
| # SDK path to use. When empty this will use the default SDK based on the
|
| # value of use_ios_simulator.
|
| @@ -83,8 +85,17 @@ if (ios_sdk_path == "") {
|
| ios_sdk_name = "iphoneos"
|
| ios_sdk_platform = "iPhoneOS"
|
| }
|
| - _ios_sdk_result =
|
| - exec_script("//build/config/mac/sdk_info.py", [ ios_sdk_name ], "scope")
|
| +
|
| + ios_sdk_info_args = []
|
| + if (!use_system_xcode) {
|
| + ios_sdk_info_args += [
|
| + "--developer_dir",
|
| + hermetic_xcode_path,
|
| + ]
|
| + }
|
| + ios_sdk_info_args += [ ios_sdk_name ]
|
| + script_name = "//build/config/mac/sdk_info.py"
|
| + _ios_sdk_result = exec_script(script_name, ios_sdk_info_args, "scope")
|
| ios_sdk_path = _ios_sdk_result.sdk_path
|
| ios_sdk_version = _ios_sdk_result.sdk_version
|
| ios_sdk_platform_path = _ios_sdk_result.sdk_platform_path
|
| @@ -102,9 +113,19 @@ if (ios_sdk_path == "") {
|
| }
|
|
|
| if (ios_enable_code_signing && !use_ios_simulator) {
|
| + find_signing_identity_args = []
|
| + if (!use_system_xcode) {
|
| + find_signing_identity_args += [
|
| + "--developer_dir",
|
| + hermetic_xcode_path,
|
| + ]
|
| + }
|
| +
|
| # If an identity is not provided, look for one on the host
|
| if (ios_code_signing_identity == "") {
|
| - _ios_identities = exec_script("find_signing_identity.py", [], "list lines")
|
| + _ios_identities = exec_script("find_signing_identity.py",
|
| + find_signing_identity_args,
|
| + "list lines")
|
| ios_code_signing_identity = _ios_identities[0]
|
| }
|
|
|
|
|