build/android/devil/android/sdk/aapt.py - Issue 1314913009: [Android] Move some pylib modules into devil/

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/devil/android/sdk/aapt.py

Issue 1314913009: [Android] Move some pylib modules into devil/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 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/devil/android/sdk/aapt.py

diff --git a/build/android/pylib/sdk/aapt.py b/build/android/devil/android/sdk/aapt.py

similarity index 88%

copy from build/android/pylib/sdk/aapt.py

copy to build/android/devil/android/sdk/aapt.py

index 3d317ff2c59a85e1182a805a718917103fffce0d..44151fc3cd6706604987a528918608fef69f8afb 100644

--- a/build/android/pylib/sdk/aapt.py

+++ b/build/android/devil/android/sdk/aapt.py

@@ -6,9 +6,9 @@

import os

-from pylib import cmd_helper

+from devil.utils import cmd_helper

+from devil.utils import timeout_retry

from pylib import constants

-from pylib.utils import timeout_retry

_AAPT_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'aapt')

@@ -39,4 +39,4 @@ def Dump(what, apk, assets=None):

assets = assets or []

if isinstance(assets, basestring):

assets = [assets]

- return _RunAaptCmd(['dump', what, apk] + assets).splitlines()

+ return _RunAaptCmd(['dump', what, apk] + assets).splitlines()