From 1961043388e63c48946322de077bebbb333fde6a Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Tue, 7 Jan 2020 03:30:49 +0000 Subject: [PATCH] Revert "Move httplib2 import above third_party." This reverts commit cd1331ea69ccdfcecc6ab07eee8ffaf21824a7c6. Reason for revert: Original CL was reverted. Original change's description: > Move httplib2 import above third_party. > > 7fd6347be3a19304f38b663de63dc81b5708e282 removed the third_party/httplib2 files, but left the pyc files. This is breaking CQ for nest. > > move httplib2 import above adding third_party to the path in ninjalog_uploader_wrapper to fix. > > Change-Id: Id28f68ce7e3eb94783bdd5ee7ce15ae5930fde7e > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1988690 > Reviewed-by: Edward Lesmes > Commit-Queue: Mark Orchard TBR=ehmaldonado@webrtc.org,ehmaldonado@chromium.org,morchard@google.com,apolito@google.com Change-Id: Ic7775cdb4abae1855358711335349fc39eb37dfb No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1988739 Reviewed-by: Edward Lesmes Commit-Queue: Edward Lesmes --- ninjalog_uploader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py index 5d44cadd21..3cc18b6726 100755 --- a/ninjalog_uploader.py +++ b/ninjalog_uploader.py @@ -18,7 +18,6 @@ The log will be used to analyze user side build performance. import argparse import cStringIO import gzip -import httplib2 import json import logging import multiprocessing @@ -28,9 +27,11 @@ import subprocess import sys import time + ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.join(ROOT_DIR, 'third_party')) +import httplib2 # These build configs affect build performance a lot. # TODO(tikuta): Add 'blink_symbol_level', 'closure_compile' and