aboutsummaryrefslogtreecommitdiff
path: root/catapult/devil/devil/android/sdk/aapt.py
diff options
context:
space:
mode:
Diffstat (limited to 'catapult/devil/devil/android/sdk/aapt.py')
-rw-r--r--catapult/devil/devil/android/sdk/aapt.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/catapult/devil/devil/android/sdk/aapt.py b/catapult/devil/devil/android/sdk/aapt.py
index 76c7ef68..fd354079 100644
--- a/catapult/devil/devil/android/sdk/aapt.py
+++ b/catapult/devil/devil/android/sdk/aapt.py
@@ -3,6 +3,8 @@
# found in the LICENSE file.
"""This module wraps the Android Asset Packaging Tool."""
+import six
+
from devil.android.sdk import build_tools
from devil.utils import cmd_helper
from devil.utils import lazy
@@ -36,6 +38,6 @@ def Dump(what, apk, assets=None):
assets: List of assets in apk you want to dump information for.
"""
assets = assets or []
- if isinstance(assets, basestring):
+ if isinstance(assets, six.string_types):
assets = [assets]
return _RunAaptCmd(['dump', what, apk] + assets).splitlines()