Skip to content

Commit

Permalink
Revert "Android: Fix colorama-related pydeps"
Browse files Browse the repository at this point in the history
This reverts commit eb669ff.

Reason for revert: Speculative, might have caused https://crbug.com/930538

Original change's description:
> 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/1458700
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#630624}

TBR=dpranke@chromium.org,agrieve@chromium.org,jbudorick@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: Ifc5fee73063ddf2f50e84010ca3bcfd8ab4a3f08
Reviewed-on: https://chromium-review.googlesource.com/c/1461737
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630649}
  • Loading branch information
nico authored and Commit Bot committed Feb 10, 2019
1 parent 1fcc841 commit 8c0e458
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions build/android/gyp/javac.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@

import jar

sys.path.insert(
0,
sys.path.append(
os.path.join(build_utils.DIR_SOURCE_ROOT, 'third_party', 'colorama', 'src'))
import colorama

Expand Down
2 changes: 1 addition & 1 deletion build/print_python_deps.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env vpython
# 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.
Expand Down

0 comments on commit 8c0e458

Please sign in to comment.