From 0c3583f0e45a6a881da56c6d69c99e1510bcecf2 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Wed, 9 Jul 2014 21:33:14 -0700
Subject: [PATCH] part 2: latest gyp pointed at official git repo.

---
 .gitmodules           |  3 +++
 third_party/gyp       |  1 +
 third_party/gyp.patch | 26 ++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 160000 third_party/gyp
 create mode 100644 third_party/gyp.patch

diff --git a/.gitmodules b/.gitmodules
index 1a9c6bc89..439bccb76 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "third_party/xbyak"]
 	path = third_party/xbyak
 	url = https://github.com/herumi/xbyak.git
+[submodule "third_party/gyp"]
+	path = third_party/gyp
+	url = https://chromium.googlesource.com/external/gyp
diff --git a/third_party/gyp b/third_party/gyp
new file mode 160000
index 000000000..867a23f4b
--- /dev/null
+++ b/third_party/gyp
@@ -0,0 +1 @@
+Subproject commit 867a23f4b596b7406cce1231a23b44b47bc1a583
diff --git a/third_party/gyp.patch b/third_party/gyp.patch
new file mode 100644
index 000000000..5f10b609c
--- /dev/null
+++ b/third_party/gyp.patch
@@ -0,0 +1,26 @@
+diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py
+index 05783d6..539614c 100644
+--- a/pylib/gyp/generator/msvs.py
++++ b/pylib/gyp/generator/msvs.py
+@@ -1963,13 +1963,17 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources,
+     if isinstance(source, MSVSProject.Filter):
+       # We have a sub-filter.  Create the name of that sub-filter.
+       if not parent_filter_name:
+-        filter_name = source.name
++        if source.name == '..':
++          filter_name = ''
++        else:
++          filter_name = source.name
+       else:
+         filter_name = '%s\\%s' % (parent_filter_name, source.name)
+       # Add the filter to the group.
+-      filter_group.append(
+-          ['Filter', {'Include': filter_name},
+-           ['UniqueIdentifier', MSVSNew.MakeGuid(source.name)]])
++      if filter_name:
++        filter_group.append(
++            ['Filter', {'Include': filter_name},
++             ['UniqueIdentifier', MSVSNew.MakeGuid(source.name)]])
+       # Recurse and add its dependents.
+       _AppendFiltersForMSBuild(filter_name, source.contents,
+                                extension_to_rule_name,