| Index: build/android/gyp/util/build_utils.py
|
| diff --git a/build/android/gyp/util/build_utils.py b/build/android/gyp/util/build_utils.py
|
| index 10c7ba2b87f821e4f028e9edad39617fc7c1c437..fe69c956f0f9f49db1ceb4e085c84668e1c7a5fc 100644
|
| --- a/build/android/gyp/util/build_utils.py
|
| +++ b/build/android/gyp/util/build_utils.py
|
| @@ -20,9 +20,9 @@ import zipfile
|
| import md5_check # pylint: disable=relative-import
|
|
|
| sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
|
| -from pylib import constants
|
| +from pylib.constants import host_paths
|
|
|
| -COLORAMA_ROOT = os.path.join(constants.DIR_SOURCE_ROOT,
|
| +COLORAMA_ROOT = os.path.join(host_paths.DIR_SOURCE_ROOT,
|
| 'third_party', 'colorama', 'src')
|
| # aapt should ignore OWNERS files in addition the default ignore pattern.
|
| AAPT_IGNORE_PATTERN = ('!OWNERS:!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:' +
|
| @@ -369,9 +369,9 @@ def GetPythonDependencies():
|
|
|
| abs_module_paths = map(os.path.abspath, module_paths)
|
|
|
| - assert os.path.isabs(constants.DIR_SOURCE_ROOT)
|
| + assert os.path.isabs(host_paths.DIR_SOURCE_ROOT)
|
| non_system_module_paths = [
|
| - p for p in abs_module_paths if p.startswith(constants.DIR_SOURCE_ROOT)]
|
| + p for p in abs_module_paths if p.startswith(host_paths.DIR_SOURCE_ROOT)]
|
| def ConvertPycToPy(s):
|
| if s.endswith('.pyc'):
|
| return s[:-1]
|
|
|