Commit acf0a83f authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Remove ios_sdk_platform_abs_path gn variable

The variable ios_sdk_platform_abs_path is always set to the value
of ios_sdk_platform_path. There is no need for two variables with
the same value, remove the less used one.

Bug: 1015730
Change-Id: Ie4903ff9e857be8032770c9732db105fe49829c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505812
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821758}
parent b8fd23aa
...@@ -133,13 +133,12 @@ group("xctest") { ...@@ -133,13 +133,12 @@ group("xctest") {
} }
_xctrunner_path = _xctrunner_path =
"$ios_sdk_platform_abs_path/Developer/Library/Xcode/Agents/XCTRunner.app" "$ios_sdk_platform_path/Developer/Library/Xcode/Agents/XCTRunner.app"
# When building with Goma RBE, $ios_sdk_platform_abs_path corresponds to a # When building with Goma RBE, $ios_sdk_platform_path corresponds to a symlink
# symlink below $root_build_dir that points to the real SDK to use. Because # below $root_build_dir that points to the real SDK to use. Because the files
# the files are below $root_build_dir, it is not possible to list them as a # are below $root_build_dir, it is not possible to list them as a target input
# target input without gn complaining (as it can't find a target creating # without gn complaining (as it can't find a target creating those files).
# those files).
# #
# The symlinks are created by //build/config/mac/sdk_info.py script invoked # The symlinks are created by //build/config/mac/sdk_info.py script invoked
# via exec_script() from //build/config/{ios/ios_sdk.gni,mac/mac_sdk.gni}. # via exec_script() from //build/config/{ios/ios_sdk.gni,mac/mac_sdk.gni}.
......
...@@ -146,7 +146,6 @@ if (ios_sdk_path == "") { ...@@ -146,7 +146,6 @@ if (ios_sdk_path == "") {
} }
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_platform_abs_path = _ios_sdk_result.sdk_platform_path
ios_sdk_path = _ios_sdk_result.sdk_path ios_sdk_path = _ios_sdk_result.sdk_path
ios_sdk_platform_path = _ios_sdk_result.sdk_platform_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
......
...@@ -1938,7 +1938,7 @@ template("ios_xcuitest_test_runner_bundle") { ...@@ -1938,7 +1938,7 @@ template("ios_xcuitest_test_runner_bundle") {
} }
_xctrunner_path = _xctrunner_path =
"$ios_sdk_platform_abs_path/Developer/Library/Xcode/Agents/XCTRunner.app" "$ios_sdk_platform_path/Developer/Library/Xcode/Agents/XCTRunner.app"
_info_plist_merge_plist = _target_name + "_info_plist_merge_plist" _info_plist_merge_plist = _target_name + "_info_plist_merge_plist"
_info_plist_target = _target_name + "_info_plist" _info_plist_target = _target_name + "_info_plist"
......
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