build/android/resource_sizes.py - Issue 2228463002: Fix various grit python paths.

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/resource_sizes.py

Issue 2228463002: Fix various grit python paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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:

Index: build/android/resource_sizes.py

diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py

index 16f9e61004f101503fd7dac01ec49a17d08b209b..b38d6475eaa5bd0f959580c8673a355fe746847c 100755

--- a/build/android/resource_sizes.py

+++ b/build/android/resource_sizes.py

@@ -29,7 +29,9 @@ from pylib.constants import host_paths

_GRIT_PATH = os.path.join(host_paths.DIR_SOURCE_ROOT, 'tools', 'grit')

-with host_paths.SysPath(_GRIT_PATH):

+# Prepend the grit module from the source tree so it takes precedence over other

+# grit versions that might present in the search path.

+with host_paths.SysPath(_GRIT_PATH, 1):

from grit.format import data_pack # pylint: disable=import-error

with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):