Commit 6c9ca74a authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Commit Bot

Add flag to make xcode SDK path relative.

For ease of putting xcode SDK under Chromium src, let me implement
an option to make SDK path relative.

Bug: 1015730
Change-Id: I3c473c3715bfc90b3692649d27ee832048a7e8bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1883469
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@google.com>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710090}
parent b05fbaec
...@@ -47,6 +47,9 @@ declare_args() { ...@@ -47,6 +47,9 @@ declare_args() {
# You can also pass the value via "--args" parameter for "gn gen" command by # You can also pass the value via "--args" parameter for "gn gen" command by
# using the syntax --args='additional_target_cpus=["arm"] target_cpu="arm64"'. # using the syntax --args='additional_target_cpus=["arm"] target_cpu="arm64"'.
additional_target_cpus = [] additional_target_cpus = []
# TODO(crbug.com/1015730): true if use_goma = true.
ios_enable_relative_sdk_path = false
} }
# Official builds may not use goma. # Official builds may not use goma.
...@@ -92,9 +95,15 @@ if (ios_sdk_path == "") { ...@@ -92,9 +95,15 @@ if (ios_sdk_path == "") {
ios_sdk_info_args += [ ios_sdk_name ] ios_sdk_info_args += [ ios_sdk_name ]
script_name = "//build/config/mac/sdk_info.py" script_name = "//build/config/mac/sdk_info.py"
_ios_sdk_result = exec_script(script_name, ios_sdk_info_args, "scope") _ios_sdk_result = exec_script(script_name, ios_sdk_info_args, "scope")
ios_sdk_path = _ios_sdk_result.sdk_path if (ios_enable_relative_sdk_path) {
ios_sdk_path = rebase_path(_ios_sdk_result.sdk_path, root_build_dir)
ios_sdk_platform_path =
rebase_path(_ios_sdk_result.sdk_platform_path, root_build_dir)
} else {
ios_sdk_path = _ios_sdk_result.sdk_path
ios_sdk_platform_path = _ios_sdk_result.sdk_platform_path
}
ios_sdk_version = _ios_sdk_result.sdk_version ios_sdk_version = _ios_sdk_result.sdk_version
ios_sdk_platform_path = _ios_sdk_result.sdk_platform_path
ios_sdk_build = _ios_sdk_result.sdk_build ios_sdk_build = _ios_sdk_result.sdk_build
xcode_version = _ios_sdk_result.xcode_version xcode_version = _ios_sdk_result.xcode_version
xcode_version_int = _ios_sdk_result.xcode_version_int xcode_version_int = _ios_sdk_result.xcode_version_int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment