Index: pylib/gyp/input.py |
diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py |
index f6ee8348f36dc88992876d469eca6609d8583091..e4aa3c898a812e7b43efcc1b57ea6ad6a306501d 100644 |
--- a/pylib/gyp/input.py |
+++ b/pylib/gyp/input.py |
@@ -229,17 +229,19 @@ def LoadOneBuildFile(build_file_path, data, aux_data, variables, includes, |
aux_data[build_file_path] = {} |
# Scan for includes and merge them in. |
- try: |
- if is_target: |
- LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data, |
- aux_data, variables, includes, check) |
- else: |
- LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data, |
- aux_data, variables, None, check) |
- except Exception, e: |
- gyp.common.ExceptionAppend(e, |
- 'while reading includes of ' + build_file_path) |
- raise |
+ if ('skip_includes' not in build_file_data or |
+ not build_file_data['skip_includes']): |
Nico
2013/10/15 17:12:50
This maybe doesn't have to be so general. Your gen
brettw
2013/10/15 17:20:02
GYP files that depend on this would just name the
|
+ try: |
+ if is_target: |
+ LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data, |
+ aux_data, variables, includes, check) |
+ else: |
+ LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data, |
+ aux_data, variables, None, check) |
+ except Exception, e: |
+ gyp.common.ExceptionAppend(e, |
+ 'while reading includes of ' + build_file_path) |
+ raise |
return build_file_data |