Source release 17.1.0
This commit is contained in:
4
third_party/gyp/input.py
vendored
4
third_party/gyp/input.py
vendored
@@ -102,13 +102,11 @@ def IsPathSection(section):
|
||||
base_non_configuration_keys = [
|
||||
# Sections that must exist inside targets and not configurations.
|
||||
'actions',
|
||||
'all_dependent_settings',
|
||||
'configurations',
|
||||
'copies',
|
||||
'default_configuration',
|
||||
'dependencies',
|
||||
'dependencies_original',
|
||||
'direct_dependent_settings',
|
||||
'libraries',
|
||||
'postbuilds',
|
||||
'product_dir',
|
||||
@@ -1183,7 +1181,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
|
||||
if variable_name in variables:
|
||||
# If the variable is already set, don't set it.
|
||||
continue
|
||||
if the_dict_key is 'variables' and variable_name in the_dict:
|
||||
if the_dict_key == 'variables' and variable_name in the_dict:
|
||||
# If the variable is set without a % in the_dict, and the_dict is a
|
||||
# variables dict (making |variables| a varaibles sub-dict of a
|
||||
# variables dict), use the_dict's definition.
|
||||
|
||||
Reference in New Issue
Block a user