From c603339365fb945069c39147b1110d94e1814c28 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@chromium.org>
Date: Thu, 14 Jan 2021 08:57:35 +0000
Subject: [PATCH] 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                    | 4 ++--
 autoninja.bat                | 4 ++--
 ninjalog_uploader.py         | 2 +-
 ninjalog_uploader_wrapper.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autoninja b/autoninja
index d9c79aa9d..a1c7f669b 100755
--- a/autoninja
+++ b/autoninja
@@ -24,12 +24,12 @@ if eval "$command"; then
   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.
diff --git a/autoninja.bat b/autoninja.bat
index c504f38c4..3b9c62aa9 100755
--- a/autoninja.bat
+++ b/autoninja.bat
@@ -38,12 +38,12 @@ FOR /f "usebackq tokens=*" %%a in (`vpython %scriptdir%autoninja.py "%*"`) do ec
 
 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.
diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py
index 42be072db..308815ea2 100755
--- a/ninjalog_uploader.py
+++ b/ninjalog_uploader.py
@@ -26,7 +26,7 @@ import subprocess
 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
diff --git a/ninjalog_uploader_wrapper.py b/ninjalog_uploader_wrapper.py
index 44efa79fe..edb03be99 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.