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

Side by Side Diff: trunk/src/DEPS

Issue 297303002: Revert 272672 "Attempt #4: Change Skia DEPS to pull from googles..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/android_webview/buildbot/deps_whitelist.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This file is automatically processed to create .DEPS.git which is the file 1 # This file is automatically processed to create .DEPS.git which is the file
2 # that gclient uses under git. 2 # that gclient uses under git.
3 # 3 #
4 # See http://code.google.com/p/chromium/wiki/UsingGit 4 # See http://code.google.com/p/chromium/wiki/UsingGit
5 # 5 #
6 # To test manually, run: 6 # To test manually, run:
7 # python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir> 7 # python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
8 # where <gcliendir> is the absolute path to the directory containing the 8 # where <gcliendir> is the absolute path to the directory containing the
9 # .gclient file (the parent of "src"). 9 # .gclient file (the parent of "src").
10 # 10 #
(...skipping 27 matching lines...) Expand all
38 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS 38 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
39 # to update other nacl_*_revision's. 39 # to update other nacl_*_revision's.
40 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev 40 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev
41 "google_toolbox_for_mac_revision": "662", 41 "google_toolbox_for_mac_revision": "662",
42 "libaddressinput_revision": "176", 42 "libaddressinput_revision": "176",
43 "libphonenumber_revision": "621", 43 "libphonenumber_revision": "621",
44 "libvpx_revision": "269083", 44 "libvpx_revision": "269083",
45 "lss_revision": "26", 45 "lss_revision": "26",
46 "sfntly_revision": "228", 46 "sfntly_revision": "228",
47 "lighttpd_revision": "33737", 47 "lighttpd_revision": "33737",
48 "skia_revision": "7693dbf46e9bf0159cc9032059738d418469a7ad", 48 "skia_revision": "14862",
49 "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa",
49 # Three lines of non-changing comments so that 50 # Three lines of non-changing comments so that
50 # the commit queue can handle CLs rolling Skia 51 # the commit queue can handle CLs rolling Skia
51 # and V8 without interference from each other. 52 # and V8 without interference from each other.
52 "v8_branch": "trunk", 53 "v8_branch": "trunk",
53 "v8_revision": "21446", 54 "v8_revision": "21446",
54 # Three lines of non-changing comments so that 55 # Three lines of non-changing comments so that
55 # the commit queue can handle CLs rolling WebRTC 56 # the commit queue can handle CLs rolling WebRTC
56 # and V8 without interference from each other. 57 # and V8 without interference from each other.
57 "webrtc_revision": "6189", 58 "webrtc_revision": "6189",
58 "jsoncpp_revision": "248", 59 "jsoncpp_revision": "248",
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), 163 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
163 164
164 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": 165 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
165 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + 166 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
166 Var("nacl_revision"), 167 Var("nacl_revision"),
167 168
168 "src/third_party/sfntly/cpp/src": 169 "src/third_party/sfntly/cpp/src":
169 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" + 170 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" +
170 Var("sfntly_revision"), 171 Var("sfntly_revision"),
171 172
172 "src/third_party/skia": 173 "src/third_party/skia/src":
173 Var("chromium_git") + "/skia.git@" + Var("skia_revision"), 174 (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"),
175
176 "src/third_party/skia/gyp":
177 (Var("googlecode_url") % "skia") + "/trunk/gyp@" + Var("skia_revision"),
178
179 "src/third_party/skia/include":
180 (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
174 181
175 "src/third_party/ots": 182 "src/third_party/ots":
176 (Var("googlecode_url") % "ots") + "/trunk@113", 183 (Var("googlecode_url") % "ots") + "/trunk@113",
177 184
178 "src/third_party/brotli/src": 185 "src/third_party/brotli/src":
179 Var("chromium_git") + 186 Var("chromium_git") +
180 "/external/font-compression-reference.git@0829e37293abc2523a1d2b0f4d68ff7b5f cd8e01", 187 "/external/font-compression-reference.git@0829e37293abc2523a1d2b0f4d68ff7b5f cd8e01",
181 188
182 "src/tools/page_cycler/acid3": 189 "src/tools/page_cycler/acid3":
183 "/trunk/deps/page_cycler/acid3@171600", 190 "/trunk/deps/page_cycler/acid3@171600",
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 "-s", "src/build/linux/bin/eu-strip.sha1", 775 "-s", "src/build/linux/bin/eu-strip.sha1",
769 ], 776 ],
770 }, 777 },
771 { 778 {
772 # A change to a .gyp, .gypi, or to GYP itself should run the generator. 779 # A change to a .gyp, .gypi, or to GYP itself should run the generator.
773 "name": "gyp", 780 "name": "gyp",
774 "pattern": ".", 781 "pattern": ".",
775 "action": ["python", "src/build/gyp_chromium"], 782 "action": ["python", "src/build/gyp_chromium"],
776 }, 783 },
777 ] 784 ]
OLDNEW
« no previous file with comments | « no previous file | trunk/src/android_webview/buildbot/deps_whitelist.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698