Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2976)

Unified Diff: build/android/gyp/util/build_utils.py

Issue 1412793012: Fix Python imported modules depfile generation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove stray slash in os.path.join Created 5 years, 2 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/jinja_template.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f69401bbb39f825981157dd125d45b63a0f67ad0..dcaa7e9ddbb23555b011aa7b3e67a82b9afa056d 100644
--- a/build/android/gyp/util/build_utils.py
+++ b/build/android/gyp/util/build_utils.py
@@ -19,10 +19,10 @@ import zipfile
# Some clients do not add //build/android/gyp to PYTHONPATH.
import md5_check # pylint: disable=relative-import
-CHROMIUM_SRC = os.path.normpath(
- os.path.join(os.path.dirname(__file__),
- os.pardir, os.pardir, os.pardir, os.pardir))
-COLORAMA_ROOT = os.path.join(CHROMIUM_SRC,
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+from pylib import constants
+
+COLORAMA_ROOT = os.path.join(constants.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>_*:' +
@@ -339,8 +339,9 @@ def GetPythonDependencies():
abs_module_paths = map(os.path.abspath, module_paths)
+ assert os.path.isabs(constants.DIR_SOURCE_ROOT)
non_system_module_paths = [
- p for p in abs_module_paths if p.startswith(CHROMIUM_SRC)]
+ p for p in abs_module_paths if p.startswith(constants.DIR_SOURCE_ROOT)]
def ConvertPycToPy(s):
if s.endswith('.pyc'):
return s[:-1]
« no previous file with comments | « build/android/gyp/jinja_template.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698