Index: pylib/gyp/input.py |
=================================================================== |
--- pylib/gyp/input.py (revision 1565) |
+++ pylib/gyp/input.py (working copy) |
@@ -2517,7 +2517,7 @@ |
def Load(build_files, variables, includes, depth, generator_input_info, check, |
- circular_check, parallel): |
+ circular_check, allow_duplicates, parallel): |
# Set up path_sections and non_configuration_keys with the default data plus |
# the generator-specifc data. |
global path_sections |
@@ -2657,10 +2657,11 @@ |
target_dict = targets[target] |
build_file = gyp.common.BuildFile(target) |
ValidateTargetType(target, target_dict) |
- # TODO(thakis): Get vpx_scale/arm/scalesystemdependent.c to be renamed to |
- # scalesystemdependent_arm_additions.c or similar. |
- if 'arm' not in variables.get('target_arch', ''): |
- ValidateSourcesInTarget(target, target_dict, build_file) |
+ if not allow_duplicates: |
+ # TODO(thakis): Get vpx_scale/arm/scalesystemdependent.c to be renamed to |
+ # scalesystemdependent_arm_additions.c or similar. |
+ if 'arm' not in variables.get('target_arch', ''): |
Sam Clegg
2013/01/29 18:55:15
Could we have some gyp variable / define that we c
|
+ ValidateSourcesInTarget(target, target_dict, build_file) |
ValidateRulesInTarget(target, target_dict, extra_sources_for_rules) |
ValidateRunAsInTarget(target, target_dict, build_file) |
ValidateActionsInTarget(target, target_dict, build_file) |