Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reland "Android: Fix colorama-related pydeps"
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