Update Xcode SDK to 12B5025f Change-Id: I8203eb2093d76e4e8a23cf5090dcd258a4526e4e Reviewed-on: https://gn-review.googlesource.com/c/gn/+/10183 Reviewed-by: Scott Graham <scottmg@chromium.org>
diff --git a/infra/recipe_modules/macos_sdk/__init__.py b/infra/recipe_modules/macos_sdk/__init__.py index f749bfd..56b6a94 100644 --- a/infra/recipe_modules/macos_sdk/__init__.py +++ b/infra/recipe_modules/macos_sdk/__init__.py
@@ -34,11 +34,11 @@ ), default={ 'sdk_version': - '10b61', + '12B5025f', 'tool_package': 'infra/tools/mac_toolchain/${platform}', 'tool_version': - 'git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e', + 'git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280', }, ) }
diff --git a/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json b/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json index e2acecd..1fb8aba 100644 --- a/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json +++ b/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json
@@ -6,7 +6,7 @@ "-root", "[CACHE]/macos_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e", + "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280", "-json-output", "/path/to/tmp/json" ], @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:434\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:e9b\", @@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -33,7 +33,7 @@ "-kind", "mac", "-xcode-version", - "10b61", + "12b5025f", "-output-dir", "[CACHE]/macos_sdk/XCode.app" ],
diff --git a/infra/recipes/gn.expected/ci_mac.json b/infra/recipes/gn.expected/ci_mac.json index 707406d..03d5da6 100644 --- a/infra/recipes/gn.expected/ci_mac.json +++ b/infra/recipes/gn.expected/ci_mac.json
@@ -95,7 +95,7 @@ "-root", "[CACHE]/macos_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e", + "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280", "-json-output", "/path/to/tmp/json" ], @@ -106,7 +106,7 @@ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:434\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:e9b\", @@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -122,7 +122,7 @@ "-kind", "mac", "-xcode-version", - "10b61", + "12b5025f", "-output-dir", "[CACHE]/macos_sdk/XCode.app" ],
diff --git a/infra/recipes/gn.expected/cq_mac.json b/infra/recipes/gn.expected/cq_mac.json index 3ae005b..b9ea47c 100644 --- a/infra/recipes/gn.expected/cq_mac.json +++ b/infra/recipes/gn.expected/cq_mac.json
@@ -122,7 +122,7 @@ "-root", "[CACHE]/macos_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e", + "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280", "-json-output", "/path/to/tmp/json" ], @@ -133,7 +133,7 @@ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:434\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:e9b\", @@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -149,7 +149,7 @@ "-kind", "mac", "-xcode-version", - "10b61", + "12b5025f", "-output-dir", "[CACHE]/macos_sdk/XCode.app" ],