| Index: build/android/pylib/apk_info.py
|
| diff --git a/build/android/pylib/apk_info.py b/build/android/pylib/apk_info.py
|
| index 00b30ddaaa3f803b0a8eee6609479ff8f454371c..426b9d102b351c7fb9c015a111fe2b1bfbff834d 100644
|
| --- a/build/android/pylib/apk_info.py
|
| +++ b/build/android/pylib/apk_info.py
|
| @@ -5,6 +5,7 @@
|
| """Gathers information about APKs."""
|
|
|
| import collections
|
| +import constants
|
| import logging
|
| import os
|
| import pickle
|
| @@ -31,7 +32,8 @@ class ApkInfo(object):
|
| """Helper class for inspecting APKs."""
|
|
|
| def __init__(self, apk_path, jar_path):
|
| - self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_SDK_ROOT'],
|
| + sdk_root = os.getenv('ANDROID_SDK_ROOT', constants.ANDROID_SDK_ROOT)
|
| + self._PROGUARD_PATH = os.path.join(sdk_root,
|
| 'tools/proguard/bin/proguard.sh')
|
| if not os.path.exists(self._PROGUARD_PATH):
|
| self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_BUILD_TOP'],
|
|
|