Source release 17.1.1

third_party/gyp/input.py

@@ -1104,7 +1104,7 @@ def EvalSingleCondition(
                                (str(e.args[0]), e.text, build_file, e.offset),
                                e.filename, e.lineno, e.offset, e.text)
     raise syntax_error
-  except NameError as e:
+  except (NameError, TypeError) as e:
     gyp.common.ExceptionAppend(e, 'while evaluating condition \'%s\' in %s' %
                                (cond_expr_expanded, build_file))
     raise GypError(e)

third_party/protoc.gypi

@@ -18,12 +18,12 @@
     ['protobuf_config=="target"', {
       # protobuf_lib is a gyp target.
       'dependencies': [
-        '<(protobuf_lib_target)',
-        '<(protoc_host_target)',
+        '<(protobuf_lib_path)',
+        '<(protoc_host_path)',
       ],
       'export_dependent_settings': [
-        '<(protobuf_lib_target)',
-        '<(protoc_host_target)',
+        '<(protobuf_lib_path)',
+        '<(protoc_host_path)',
       ],
     }],
     ['protobuf_config=="source"', {