Switching net over to use gyp on windows.

Review URL: http://codereview.chromium.org/48108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11942 0039d316-1c4b-4281-b951-d872f2087c98
trevorlinton · Mar 18, 2009 · b823446 · b823446
1 parent 05f3813
commit b823446
Show file tree

Hide file tree

Showing 15 changed files with 1,781 additions and 2,382 deletions.
diff --git a/build/all.gyp b/build/all.gyp
@@ -22,13 +22,13 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:*',
+        '../net/net.gyp:*',
       ],
       'conditions': [
         ['all_gyps', {
           'dependencies': [
             '../chrome/chrome.gyp:*',
             '../media/media.gyp:*',
-            '../net/net.gyp:*',
             '../printing/printing.gyp:*',
             '../sdch/sdch.gyp:*',
             '../skia/skia.gyp:*',

diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
@@ -208,7 +208,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
+				RelativePath="$(OutDir)\obj\global_intermediate\net\net_resources.rc"
 				>
 			</File>
 			<File

diff --git a/chrome/chrome.sln b/chrome/chrome.sln
diff --git a/chrome/test/interactive_ui/interactive_ui.vcproj b/chrome/test/interactive_ui/interactive_ui.vcproj
@@ -272,7 +272,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
+				RelativePath="$(OutDir)\obj\global_intermediate\net\net_resources.rc"
 				>
 			</File>
 			<File

diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
@@ -336,7 +336,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
+				RelativePath="$(OutDir)\obj\global_intermediate\net\net_resources.rc"
 				>
 			</File>
 			<File

diff --git a/net/net.gyp b/net/net.gyp
@@ -501,7 +501,7 @@
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
       ],
-      'msvs_guid': '{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}',
+      'msvs_guid': 'E13045CD-7E1F-4A41-9B18-8D288B2E7B41',
       'sources': [
         'tools/tld_cleanup/tld_cleanup.cc',
       ],

diff --git a/net/net.sln b/net/net.sln
-Original file line number
+Diff line change
@@ Expand Up / @@ -208,7 +208,7 @@ @@
     				>
     			</File>
     			<File
-    				RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
+    				RelativePath="$(OutDir)\obj\global_intermediate\net\net_resources.rc"
     				>
     			</File>
     			<File
@@ Expand Down @@