Commit eb669ffa authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Fix colorama-related pydeps

//.vpython recently had colorama added to it, which means that adding the
third_party version of colorama to then end of sys.path would result in
the system package being chosen.

This fixes the import order of javac.py so that the third_party/
one is chosen over system packages.

It also changes print_python_deps.py to *not* use vpython, so that
it will match the behavior of GN / Ninja.

Change-Id: I39cc397fa7d3fe32ddc15893bfda356b79ce8ecf
Reviewed-on: https://chromium-review.googlesource.com/c/1458700Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630624}
parent cd7fb1b7
......@@ -21,7 +21,8 @@ from util import jar_info_utils
import jar
sys.path.append(
sys.path.insert(
0,
os.path.join(build_utils.DIR_SOURCE_ROOT, 'third_party', 'colorama', 'src'))
import colorama
......
#!/usr/bin/env vpython
#!/usr/bin/env python
# Copyright 2016 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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment