diff --git a/.gitignore b/.gitignore index 75afb3023..e41ec8cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,7 @@ /.versions # ignore ninja.exe copied from .cipd_bin. -# TODO(crbug.com/931218): checkin ninja.exe for issues that can't ensure -# ninja.exe as expected. -# /ninja.exe +/ninja.exe # Ignore "disable auto update" sentinel file. .disable_auto_update diff --git a/cipd_bin_setup.bat b/cipd_bin_setup.bat index 8ace8869d..3936fc0d5 100644 --- a/cipd_bin_setup.bat +++ b/cipd_bin_setup.bat @@ -5,5 +5,4 @@ call "%~dp0\cipd.bat" ensure -log-level warning -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin" :: copy ninja.exe to the root since many places assume ninja.exe exists in depot_tools. -:: TODO(crbug.com/931218): check in ninja.exe for now. -:: copy /y "%~dp0\.cipd_bin\ninja.exe" "%~dp0\ninja.exe" > nul +copy /y "%~dp0\.cipd_bin\ninja.exe" "%~dp0\ninja.exe" > nul diff --git a/ninja.exe b/ninja.exe deleted file mode 100644 index 799949ed6..000000000 Binary files a/ninja.exe and /dev/null differ