Changeset 57620 in webkit
- Timestamp:
- Apr 14, 2010 5:13:16 PM (14 years ago)
- Location:
- trunk/WebKit/chromium
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r57606 r57620 1 2010-04-12 Tony Chang <tony@chromium.org> 2 3 Reviewed by Darin Fisher. 4 5 [chromium] update chromium DEPS for upstream compile 6 https://bugs.webkit.org/show_bug.cgi?id=36578 7 8 * DEPS: Pull sub deps from chromium's DEPS file 9 1 10 2010-04-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 11 -
trunk/WebKit/chromium/DEPS
r57508 r57620 33 33 vars = { 34 34 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', 35 'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party', 36 37 # Dependencies' revisions to use: 38 'chromium_rev': '43715', 39 'google-url_rev': '127', 40 'gtest_rev': '408', 41 'gyp_rev': '810', 42 'icu_rev': '43139', 43 'openvcdiff_rev': '28', 44 'ots_rev': '26', 45 'skia_rev': '504', 46 'v8_rev': '4386', 47 48 # Windows: 49 'cygwin_rev': '11984', 50 'ffmpeg_ia32_rev': '42726', 35 'chromium_rev': '44239', 36 51 37 'pthreads-win32_rev': '26716', 52 'python_24_rev': '22967',53 'nss_rev': '39612',54 38 } 55 39 56 40 deps = { 41 'chromium_deps': 42 File(Var('chromium_svn')+'/DEPS@'+Var('chromium_rev')), 43 57 44 # build tools 58 45 'build': 59 46 Var('chromium_svn')+'/build@'+Var('chromium_rev'), 60 47 'tools/gyp': 61 'http://gyp.googlecode.com/svn/trunk@'+Var('gyp_rev'),48 From('chromium_deps', 'src/tools/gyp'), 62 49 63 50 # Basic tools … … 70 57 'skia': 71 58 Var('chromium_svn')+'/skia@'+Var('chromium_rev'), 72 'third_party/skia': 73 'http://skia.googlecode.com/svn/trunk@'+Var('skia_rev'), 59 'third_party/skia/src': 60 From('chromium_deps', 'src/third_party/skia/src'), 61 'third_party/skia/include': 62 From('chromium_deps', 'src/third_party/skia/include'), 74 63 75 64 # testing … … 77 66 Var('chromium_svn')+'/testing@'+Var('chromium_rev'), 78 67 'testing/gtest': 79 'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'),68 From('chromium_deps', 'src/testing/gtest'), 80 69 81 70 # v8 javascript engine 82 'v8': 83 'http://v8.googlecode.com/svn/trunk@'+Var('v8_rev'), 84 'testing/gtest': 85 'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'), 71 'v8': From('chromium_deps', 'src/v8'), 86 72 87 73 # net dependencies … … 91 77 Var('chromium_svn')+'/sdch@'+Var('chromium_rev'), 92 78 'sdch/open-vcdiff': 93 'http://open-vcdiff.googlecode.com/svn/trunk@'+Var('openvcdiff_rev'),79 From('chromium_deps', 'src/sdch/open-vcdiff'), 94 80 'googleurl': 95 'http://google-url.googlecode.com/svn/trunk@'+Var('google-url_rev'), 81 From('chromium_deps', 'src/googleurl'), 82 83 # webkit dependencis 84 'webkit': Var('chromium_svn')+'/webkit@'+Var('chromium_rev'), 85 86 'app': 87 Var('chromium_svn')+'/app@'+Var('chromium_rev'), # needed by appcache 88 'gpu': 89 Var('chromium_svn')+'/gpu@'+Var('chromium_rev'), 90 'media': 91 Var('chromium_svn')+'/media@'+Var('chromium_rev'), 92 'third_party/glew': # webgl related 93 Var('chromium_svn')+'/third_party/glew@'+Var('chromium_rev'), 94 'third_party/ffmpeg': # needed by webkit/media 95 Var('chromium_svn')+'/third_party/ffmpeg@'+Var('chromium_rev'), 96 'third_party/yasm': # needed by ffmpeg 97 Var('chromium_svn')+'/third_party/yasm@'+Var('chromium_rev'), 98 'third_party/openmax': # needed by webkit/media 99 Var('chromium_svn')+'/third_party/openmax@'+Var('chromium_rev'), 100 'tools/grit': 101 Var('chromium_svn')+'/tools/grit@'+Var('chromium_rev'), 102 'tools/generate_stubs': 103 Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'), 96 104 97 105 # other third party 98 106 'third_party/icu': 99 Var('chromium_deps_svn')+'/icu42@'+Var('icu_rev'),107 From('chromium_deps', 'src/third_party/icu'), 100 108 101 109 'third_party/bzip2': … … 124 132 125 133 'third_party/ots': 126 'http://ots.googlecode.com/svn/trunk@'+Var('ots_rev'),134 From('chromium_deps', 'src/third_party/ots'), 127 135 128 136 'third_party/sqlite': … … 134 142 'third_party/zlib': 135 143 Var('chromium_svn')+'/third_party/zlib@'+Var('chromium_rev'), 144 145 'third_party/ffmpeg/source/patched-ffmpeg-mt': 146 From('chromium_deps', 'src/third_party/ffmpeg/source/patched-ffmpeg-mt'), 136 147 } 137 148 … … 139 150 'win': { 140 151 'third_party/cygwin': 141 Var('chromium_deps_svn')+'/cygwin@'+Var('cygwin_rev'), 142 152 From('chromium_deps', 'src/third_party/cygwin'), 143 153 'third_party/python_24': 144 Var('chromium_deps_svn')+'/python_24@'+Var('python_24_rev'), 145 154 From('chromium_deps', 'src/third_party/python_24'), 146 155 'third_party/ffmpeg/binaries/chromium/win/ia32': 147 Var('chromium_deps_svn')+'/ffmpeg/binaries/win@'+Var('ffmpeg_ia32_rev'), 148 156 From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'), 149 157 'third_party/pthreads-win32': 150 Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'), 151 152 # base.gypi depends on nss on Windows 153 'third_party/nss': 154 Var('chromium_deps_svn')+'/nss@'+Var('nss_rev'), 158 'http://src.chromium.org/svn/trunk/deps/third_party/pthreads-win32@'+Var('pthreads-win32_rev'), 159 # base.gypi depends on nss on Windows 160 'third_party/nss': 161 From('chromium_deps', 'src/third_party/nss'), 162 'third_party/wtl': 163 Var('chromium_svn')+'/third_party/wtl@'+Var('chromium_rev'), 164 }, 165 'mac': { 166 # needed by ffmpeg 167 'third_party/yasm/source/patched-yasm': 168 From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'), 155 169 }, 156 170 'unix': { … … 158 172 'third_party/harfbuzz': 159 173 Var('chromium_svn')+'/third_party/harfbuzz@'+Var('chromium_rev'), 160 161 174 'tools/xdisplaycheck': 162 175 Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'), 176 'third_party/yasm/source/patched-yasm': 177 From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'), 163 178 }, 164 179 }
Note: See TracChangeset
for help on using the changeset viewer.