Revert of Add work-around to symlink.gni to avoid "not up-to-date" ninja errors (patchset #1 id:1 of https://codereview.chromium.org/2344243002/ )

Reason for revert:
Breaks iOS build with failure:

FAILED: gen/linked_src/third_party/objective_c/google_toolbox_for_mac
python ../../build/symlink.py --update-target-mtimes -f ../../../../../../third_party/google_toolbox_for_mac/src gen/linked_src/third_party/objective_c/google_toolbox_for_mac
Traceback (most recent call last):
  File "../../build/symlink.py", line 65, in <module>
    sys.exit(Main(sys.argv))
  File "../../build/symlink.py", line 56, in Main
    os.utime(s, None)
OSError: [Errno 2] No such file or directory: '../../../../../../third_party/google_toolbox_for_mac/src'

Original issue's description:
> Add work-around to symlink.gni to avoid "not up-to-date" ninja errors
>
> Ninja bug: https://github.com/ninja-build/ninja/issues/1186
>
> BUG=646165
>
> Committed: https://crrev.com/80f464d5151c3eec102604faf5fa36d9369b64aa
> Cr-Commit-Position: refs/heads/master@{#419751}

TBR=dpranke@chromium.org,agrieve@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=646165

Review-Url: https://codereview.chromium.org/2356973002
Cr-Original-Commit-Position: refs/heads/master@{#419871}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 65f3a42b24088c3a96de9becbe96c4a0094ca843
This commit is contained in:
jyquinn 2016-09-20 15:13:40 -07:00 коммит произвёл Commit bot
Родитель 67b53eb949
Коммит 2695bccd4a
2 изменённых файлов: 0 добавлений и 6 удалений

Просмотреть файл

@ -19,7 +19,6 @@ template("symlink") {
] ]
script = "//build/symlink.py" script = "//build/symlink.py"
args = [ args = [
"--update-target-mtimes",
"-f", "-f",
rebase_path(invoker.source, get_path_info(invoker.output, "dir")), rebase_path(invoker.source, get_path_info(invoker.output, "dir")),
rebase_path(invoker.output, root_build_dir), rebase_path(invoker.output, root_build_dir),

Просмотреть файл

@ -24,7 +24,6 @@ def Main(argv):
parser = optparse.OptionParser() parser = optparse.OptionParser()
parser.add_option('-f', '--force', action='store_true') parser.add_option('-f', '--force', action='store_true')
parser.add_option('--touch') parser.add_option('--touch')
parser.add_option('--update-target-mtimes', action='store_true')
options, args = parser.parse_args(argv[1:]) options, args = parser.parse_args(argv[1:])
if len(args) < 2: if len(args) < 2:
@ -50,10 +49,6 @@ def Main(argv):
os.symlink(s, t) os.symlink(s, t)
else: else:
raise raise
if options.update_target_mtimes:
# Work-around for ninja bug:
# https://github.com/ninja-build/ninja/issues/1186
os.utime(s, None)
if options.touch: if options.touch: