build/android/pylib/utils/isolator.py - Issue 1401893003: Fix Android unit tests failing when using a GN output directory of foo/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/utils/isolator.py

Issue 1401893003: Fix Android unit tests failing when using a GN output directory of foo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/android/pylib/utils/isolator.py

diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py

index 18f9eed4a2eafb0f496357ee7e19e276e5f5b149..8f6a0241cb3ded91ac2f8299d9c81f310e3f2acc 100644

--- a/build/android/pylib/utils/isolator.py

+++ b/build/android/pylib/utils/isolator.py

@@ -158,8 +158,7 @@ class Isolator(object):

deps_out_dir = os.path.join(

self._isolate_deps_dir,

- os.path.relpath(os.path.join(constants.GetOutDirectory(), os.pardir),

jbudorick 2015/10/14 17:56:30 Yeah, this will definitely break our GYP builds at

- constants.DIR_SOURCE_ROOT))

+ os.path.relpath(constants.GetOutDirectory(), constants.DIR_SOURCE_ROOT))

for root, _, filenames in os.walk(deps_out_dir):

for filename in fnmatch.filter(filenames, '*.pak'):

shutil.move(os.path.join(root, filename), paks_dir)

« no previous file with comments | « no previous file | no next file » | no next file with comments »