Skip to content

Commit

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

Reason for revert: Relanding just the javac.py part

Original change's description:
> Revert "Android: Fix colorama-related pydeps"
> 
> 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}

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

Change-Id: I5f3be2797c10f6a3dd998b436cf3d1c0451e8f79
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/1463723
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630767}
  • Loading branch information
agrieve authored and Commit Bot committed Feb 11, 2019
1 parent 8b5a10d commit af7cfd5
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build/android/gyp/javac.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

import jar

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

Expand Down

0 comments on commit af7cfd5

Please sign in to comment.