Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: DEPS

Issue 1233001: Temporarily rollback gyp changes for Windows only. Trying to track down regression. (Closed)
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 vars = { 1 vars = {
2 "webkit_trunk": 2 "webkit_trunk":
3 "http://svn.webkit.org/repository/webkit/trunk", 3 "http://svn.webkit.org/repository/webkit/trunk",
4 "webkit_revision": "56418", 4 "webkit_revision": "56418",
5 "ffmpeg_revision": "42314", 5 "ffmpeg_revision": "42314",
6 "skia_revision": "504", 6 "skia_revision": "504",
7 "chromium_git": "http://src.chromium.org/git", 7 "chromium_git": "http://src.chromium.org/git",
8 "swig_revision": "40423", 8 "swig_revision": "40423",
9 "nacl_revision": "1760", 9 "nacl_revision": "1760",
10 } 10 }
(...skipping 19 matching lines...) Expand all
30 30
31 "src/third_party/icu": 31 "src/third_party/icu":
32 "/trunk/deps/third_party/icu42@37341", 32 "/trunk/deps/third_party/icu42@37341",
33 33
34 "src/third_party/hunspell": 34 "src/third_party/hunspell":
35 "/trunk/deps/third_party/hunspell128@41000", 35 "/trunk/deps/third_party/hunspell128@41000",
36 36
37 "src/third_party/protobuf2/src": 37 "src/third_party/protobuf2/src":
38 "http://protobuf.googlecode.com/svn/trunk@305", 38 "http://protobuf.googlecode.com/svn/trunk@305",
39 39
40 "src/tools/gyp":
41 "http://gyp.googlecode.com/svn/trunk@800",
42
43 "src/v8": 40 "src/v8":
44 "http://v8.googlecode.com/svn/trunk@4209", 41 "http://v8.googlecode.com/svn/trunk@4209",
45 42
46 "src/native_client": 43 "src/native_client":
47 "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + 44 "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" +
48 Var("nacl_revision"), 45 Var("nacl_revision"),
49 46
50 "src/third_party/skia/src": 47 "src/third_party/skia/src":
51 "http://skia.googlecode.com/svn/trunk/src@" + Var("skia_revision"), 48 "http://skia.googlecode.com/svn/trunk/src@" + Var("skia_revision"),
52 49
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 "src/third_party/nss": 135 "src/third_party/nss":
139 "/trunk/deps/third_party/nss@39612", 136 "/trunk/deps/third_party/nss@39612",
140 137
141 "src/third_party/swig/win": 138 "src/third_party/swig/win":
142 "/trunk/deps/third_party/swig/win@" + Var("swig_revision"), 139 "/trunk/deps/third_party/swig/win@" + Var("swig_revision"),
143 140
144 "src/third_party/mingw-w64/mingw/bin": 141 "src/third_party/mingw-w64/mingw/bin":
145 ("http://nativeclient.googlecode.com/svn/trunk/src/third_party/mingw-w64/m ingw/bin@" + 142 ("http://nativeclient.googlecode.com/svn/trunk/src/third_party/mingw-w64/m ingw/bin@" +
146 Var("nacl_revision")), 143 Var("nacl_revision")),
147 144
145 "src/tools/gyp":
146 "http://gyp.googlecode.com/svn/trunk@794",
147
148 }, 148 },
149 "mac": { 149 "mac": {
150 "src/chrome/tools/test/reference_build/chrome_mac": 150 "src/chrome/tools/test/reference_build/chrome_mac":
151 "/trunk/deps/reference_builds/chrome_mac@41963", 151 "/trunk/deps/reference_builds/chrome_mac@41963",
152 152
153 "src/third_party/GTM": 153 "src/third_party/GTM":
154 "http://google-toolbox-for-mac.googlecode.com/svn/trunk@312", 154 "http://google-toolbox-for-mac.googlecode.com/svn/trunk@312",
155 "src/third_party/pdfsqueeze": 155 "src/third_party/pdfsqueeze":
156 "http://pdfsqueeze.googlecode.com/svn/trunk@2", 156 "http://pdfsqueeze.googlecode.com/svn/trunk@2",
157 "src/third_party/lighttpd": 157 "src/third_party/lighttpd":
158 "/trunk/deps/third_party/lighttpd@33737", 158 "/trunk/deps/third_party/lighttpd@33737",
159 159
160 "src/third_party/WebKit/WebKit/mac": 160 "src/third_party/WebKit/WebKit/mac":
161 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"), 161 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
162 "src/third_party/WebKit/WebKitLibraries": 162 "src/third_party/WebKit/WebKitLibraries":
163 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"), 163 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
164 164
165 # TODO(ajwong): Move this into the OS-independent block. 165 # TODO(ajwong): Move this into the OS-independent block.
166 "src/third_party/yasm/source/patched-yasm": 166 "src/third_party/yasm/source/patched-yasm":
167 "/trunk/deps/third_party/yasm/patched-yasm@29937", 167 "/trunk/deps/third_party/yasm/patched-yasm@29937",
168 "src/third_party/ffmpeg/source/patched-ffmpeg-mt": 168 "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
169 "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" + 169 "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
170 Var("ffmpeg_revision"), 170 Var("ffmpeg_revision"),
171 171
172 "src/third_party/swig/mac": 172 "src/third_party/swig/mac":
173 "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"), 173 "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"),
174
175 "src/tools/gyp":
176 "http://gyp.googlecode.com/svn/trunk@800",
174 }, 177 },
175 "unix": { 178 "unix": {
176 # Linux, really. 179 # Linux, really.
177 "src/chrome/tools/test/reference_build/chrome_linux": 180 "src/chrome/tools/test/reference_build/chrome_linux":
178 "/trunk/deps/reference_builds/chrome_linux@41515", 181 "/trunk/deps/reference_builds/chrome_linux@41515",
179 182
180 "src/third_party/xdg-utils": 183 "src/third_party/xdg-utils":
181 "/trunk/deps/third_party/xdg-utils@29103", 184 "/trunk/deps/third_party/xdg-utils@29103",
182 185
183 # TODO(ajwong): Move this into the OS-independent block. 186 # TODO(ajwong): Move this into the OS-independent block.
184 "src/third_party/yasm/source/patched-yasm": 187 "src/third_party/yasm/source/patched-yasm":
185 "/trunk/deps/third_party/yasm/patched-yasm@29937", 188 "/trunk/deps/third_party/yasm/patched-yasm@29937",
186 "src/third_party/ffmpeg/source/patched-ffmpeg-mt": 189 "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
187 "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" + 190 "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
188 Var("ffmpeg_revision"), 191 Var("ffmpeg_revision"),
189 192
190 "src/third_party/swig/linux": 193 "src/third_party/swig/linux":
191 "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"), 194 "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"),
195
196 "src/tools/gyp":
197 "http://gyp.googlecode.com/svn/trunk@800",
192 }, 198 },
193 } 199 }
194 200
195 201
196 include_rules = [ 202 include_rules = [
197 # Everybody can use some things. 203 # Everybody can use some things.
198 "+base", 204 "+base",
199 "+build", 205 "+build",
200 "+ipc", 206 "+ipc",
201 207
(...skipping 30 matching lines...) Expand all
232 "action": ["python", "src/build/gyp_chromium"], 238 "action": ["python", "src/build/gyp_chromium"],
233 }, 239 },
234 { 240 {
235 # Workaround XCode dependecies problem. 241 # Workaround XCode dependecies problem.
236 # TODO(bradnelson): remove this when fixed. 242 # TODO(bradnelson): remove this when fixed.
237 "pattern": ".", 243 "pattern": ".",
238 "action": ["python", 244 "action": ["python",
239 "src/build/mac/clobber_generated_headers.py"], 245 "src/build/mac/clobber_generated_headers.py"],
240 }, 246 },
241 ] 247 ]
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698