From cfca12d4a5ee1730d582c3ab49ee3c33ca1f6f9f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 25 Dec 2013 18:47:19 +0800
Subject: [PATCH] Use the gyp vendored by brightray.

---
 .gitmodules      | 3 ---
 script/update.py | 2 +-
 vendor/gyp       | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 160000 vendor/gyp

diff --git a/.gitmodules b/.gitmodules
index c114e1489d86..7b3e48f26652 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "vendor/node"]
 	path = vendor/node
   url = https://github.com/atom/node.git
-[submodule "vendor/gyp"]
-	path = vendor/gyp
-	url = https://github.com/svn2github/gyp.git
 [submodule "vendor/depot_tools"]
 	path = vendor/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
diff --git a/script/update.py b/script/update.py
index 1b21b0f584b4..8940cf777114 100755
--- a/script/update.py
+++ b/script/update.py
@@ -22,7 +22,7 @@ def update_frameworks():
 
 
 def update_gyp():
-  gyp = os.path.join('vendor', 'gyp', 'gyp_main.py')
+  gyp = os.path.join('vendor', 'brightray', 'vendor', 'gyp', 'gyp_main.py')
   python = sys.executable
   if sys.platform == 'cygwin':
     python = os.path.join('vendor', 'python_26', 'python.exe')
diff --git a/vendor/gyp b/vendor/gyp
deleted file mode 160000
index 88202fb4e5db..000000000000
--- a/vendor/gyp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 88202fb4e5db8d3ba3051fc2ce36f35aae22f69d