Commit 316b5e7e authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Force target to be dirty if xcode_version changes

The binary XCTRunner will change if the version of Xcode changes,
but the timestamp and the input paths may not be reliable signals
to determine whether the target is dirty.

Force the command-line of build/config/ios/strip_arm64e.py to be
different if the version of Xcode changes. This will force ninja
to consider the target as dirty and will force using the correct
version of the binary (even if older than current output).

The parameter is ignored by the script, it is there only to force
ninja to consider the target dirty:

  $ ninja -C out/Debug-iphoneos -d explain
  ...
  ninja explain: command line changed for obj/build/config/ios/XCTRunner
  ...


Bug: 1101531
Change-Id: Iaf2baf8eadc2e5b3c66848d5f9be9638c5b44dc1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2301975
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789071}
parent 0ded56a9
......@@ -169,6 +169,8 @@ action("xctest_runner_without_arm64e") {
rebase_path(outputs[0], root_build_dir),
"--input",
rebase_path(sources[0], root_build_dir),
"--xcode-version",
xcode_version,
]
if (ios_use_goma_rbe) {
......
......@@ -33,6 +33,7 @@ def parse_args(args):
parser = argparse.ArgumentParser()
parser.add_argument('--input', required=True, help='Path to input binary')
parser.add_argument('--output', required=True, help='Path to output binary')
parser.add_argument('--xcode-version', required=True, help='Version of Xcode')
return parser.parse_args(args)
......
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