commit c603339365fb945069c39147b1110d94e1814c28
author Takuto Ikuta <tikuta@chromium.org> Thu Jan 14 08:57:35 2021 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 14 08:57:35 2021 +0000
tree 305cbb0727e5044d8056ae097c025e2415591ad3
parent 703f21e21747c2b91a618401a9ab7a14e418745f

autoninja: use pure python for ninjalog_uploader_wrapper.py

I'll update to python3 separately.

Bug: b/177465438
Change-Id: Id204789f2d0854a796e5408597700d90dc8cd191
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2626863
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>

autoninja

diff --git a/autoninja b/autoninja
index d9c79aa..a1c7f66 100755
--- a/autoninja
+++ b/autoninja
@@ -24,12 +24,12 @@
   fi
 
   # Collect ninjalog from googler.
-  vpython "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
+  python "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
   exit
 fi
 
 # Collect ninjalog from googler.
-vpython "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
+python "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
 
 # Return an error code of 1 so that if a developer types:
 # "autoninja chrome && chrome" then chrome won't run if the build fails.

autoninja.bat

diff --git a/autoninja.bat b/autoninja.bat
index c504f38..3b9c62a 100755
--- a/autoninja.bat
+++ b/autoninja.bat
@@ -38,12 +38,12 @@
 
 REM Use call to invoke vpython script here, because we use vpython via vpython.bat.
 @if "%NINJA_SUMMARIZE_BUILD%" == "1" call vpython.bat %scriptdir%post_build_ninja_summary.py %*
-@call vpython.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
+@call python.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
 
 exit /b
 :buildfailure
 
-@call vpython.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
+@call python.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
 
 REM Return an error code of 1 so that if a developer types:
 REM "autoninja chrome && chrome" then chrome won't run if the build fails.

ninjalog_uploader.py

diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py
index 42be072..308815e 100755
--- a/ninjalog_uploader.py
+++ b/ninjalog_uploader.py
@@ -26,7 +26,7 @@
 import sys
 import time
 
-import httplib2
+from third_party import httplib2
 
 # These build configs affect build performance a lot.
 # TODO(https://crbug.com/900161): Add 'blink_symbol_level' and

ninjalog_uploader_wrapper.py

diff --git a/ninjalog_uploader_wrapper.py b/ninjalog_uploader_wrapper.py
index 44efa79..edb03be 100755
--- a/ninjalog_uploader_wrapper.py
+++ b/ninjalog_uploader_wrapper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright 2018 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.