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

Side by Side Diff: DEPS

Issue 165193: Move to using updated chromium binaries pulled in via platform-specific DEPS. (Closed)
Patch Set: Created 11 years, 4 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 | third_party/ffmpeg/binaries/chromium/README.chromium » ('j') | 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": "46910", 4 "webkit_revision": "46910",
5 } 5 }
6 6
7 7
8 deps = { 8 deps = {
9 "src/breakpad/src": 9 "src/breakpad/src":
10 "http://google-breakpad.googlecode.com/svn/trunk/src@346", 10 "http://google-breakpad.googlecode.com/svn/trunk/src@346",
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 82
83 83
84 deps_os = { 84 deps_os = {
85 "win": { 85 "win": {
86 "src/third_party/cygwin": 86 "src/third_party/cygwin":
87 "/trunk/deps/third_party/cygwin@11984", 87 "/trunk/deps/third_party/cygwin@11984",
88 88
89 "src/third_party/python_24": 89 "src/third_party/python_24":
90 "/trunk/deps/third_party/python_24@19441", 90 "/trunk/deps/third_party/python_24@19441",
91
92 "src/third_party/ffmpeg/binaries/chromium":
93 "/trunk/deps/third_party/ffmpeg/binaries/win@22838",
91 }, 94 },
92 "mac": { 95 "mac": {
93 "src/third_party/GTM": 96 "src/third_party/GTM":
94 "http://google-toolbox-for-mac.googlecode.com/svn/trunk@170", 97 "http://google-toolbox-for-mac.googlecode.com/svn/trunk@170",
95 "src/third_party/pdfsqueeze": 98 "src/third_party/pdfsqueeze":
96 "http://pdfsqueeze.googlecode.com/svn/trunk@2", 99 "http://pdfsqueeze.googlecode.com/svn/trunk@2",
97 "src/third_party/WebKit/WebKit/mac": 100 "src/third_party/WebKit/WebKit/mac":
98 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"), 101 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
99 "src/third_party/WebKit/WebKitLibraries": 102 "src/third_party/WebKit/WebKitLibraries":
100 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"), 103 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
104 "src/third_party/ffmpeg/binaries/chromium":
105 "/trunk/deps/third_party/ffmpeg/binaries/mac@22838",
101 }, 106 },
102 "unix": { 107 "unix": {
103 # Linux, really. 108 # Linux, really.
104 "src/third_party/xdg-utils": 109 "src/third_party/xdg-utils":
105 "/trunk/deps/third_party/xdg-utils@22207", 110 "/trunk/deps/third_party/xdg-utils@22207",
111 "src/third_party/ffmpeg/binaries/chromium":
112 "/trunk/deps/third_party/ffmpeg/binaries/linux@22838",
106 }, 113 },
107 } 114 }
108 115
109 116
110 include_rules = [ 117 include_rules = [
111 # Everybody can use some things. 118 # Everybody can use some things.
112 "+base", 119 "+base",
113 "+build", 120 "+build",
114 "+ipc", 121 "+ipc",
115 122
(...skipping 27 matching lines...) Expand all
143 # A change to a .gyp, .gypi, or to GYP itself shound run the generator. 150 # A change to a .gyp, .gypi, or to GYP itself shound run the generator.
144 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]", 151 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]",
145 "action": ["python", "src/tools/gyp/gyp_chromium"], 152 "action": ["python", "src/tools/gyp/gyp_chromium"],
146 }, 153 },
147 { 154 {
148 # Workaround IncrediBuild problem. http://crbug.com/17706. 155 # Workaround IncrediBuild problem. http://crbug.com/17706.
149 "pattern": "\\.grd$", 156 "pattern": "\\.grd$",
150 "action": ["python", "src/build/win/clobber_generated_headers.py", "$matchin g_files"], 157 "action": ["python", "src/build/win/clobber_generated_headers.py", "$matchin g_files"],
151 }, 158 },
152 ] 159 ]
OLDNEW
« no previous file with comments | « no previous file | third_party/ffmpeg/binaries/chromium/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698