slave/skia_slave_scripts/merge_into_android.py - Issue 344183004: Use new common utils where possible.

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: slave/skia_slave_scripts/merge_into_android.py

Issue 344183004: Use new common utils where possible. (Closed) Base URL: https://skia.googlesource.com/buildbot.git@master

Patch Set: rebase Created 6 years, 5 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: slave/skia_slave_scripts/merge_into_android.py

diff --git a/slave/skia_slave_scripts/merge_into_android.py b/slave/skia_slave_scripts/merge_into_android.py

index 27ebcd1c8f1d99790d20db63d4ed9f7920c1b795..af872cf26817999683a53227d3c5a64fca1039e9 100644

--- a/slave/skia_slave_scripts/merge_into_android.py

+++ b/slave/skia_slave_scripts/merge_into_android.py

@@ -13,10 +13,10 @@ import sys

from build_step import BuildStep, BuildStepFailure, BuildStepWarning

import skia_vars

from sync_android import ANDROID_CHECKOUT_PATH, REPO, GitAuthenticate

-from utils.git_utils import GIT

-from utils import git_utils

-from utils import misc

-from utils import shell_utils

+from py.utils.git_utils import GIT

+from py.utils import git_utils

+from py.utils import misc

+from py.utils import shell_utils

SKIA_REPO_URL = skia_vars.GetGlobalVariable('skia_git_url')

SKIA_REV_URL = skia_vars.GetGlobalVariable('revlink_tmpl')