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

Side by Side Diff: DEPS

Issue 215016: Update ffmpeg binaries directories to support variants based off the target architecture. (Closed)
Patch Set: Fix linux installer. Created 11 years, 3 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 | build/common.gypi » ('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": "48500", 4 "webkit_revision": "48500",
5 "ffmpeg_revision": "26428",
5 } 6 }
6 7
7 deps = { 8 deps = {
8 "src/breakpad/src": 9 "src/breakpad/src":
9 "http://google-breakpad.googlecode.com/svn/trunk/src@391", 10 "http://google-breakpad.googlecode.com/svn/trunk/src@391",
10 11
11 "src/build/util/support": 12 "src/build/util/support":
12 "/trunk/deps/support@20411", 13 "/trunk/deps/support@20411",
13 14
14 "src/googleurl": 15 "src/googleurl":
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 88
88 89
89 deps_os = { 90 deps_os = {
90 "win": { 91 "win": {
91 "src/third_party/cygwin": 92 "src/third_party/cygwin":
92 "/trunk/deps/third_party/cygwin@11984", 93 "/trunk/deps/third_party/cygwin@11984",
93 94
94 "src/third_party/python_24": 95 "src/third_party/python_24":
95 "/trunk/deps/third_party/python_24@22967", 96 "/trunk/deps/third_party/python_24@22967",
96 97
97 "src/third_party/ffmpeg/binaries/chromium": 98 "src/third_party/ffmpeg/binaries/chromium/win/ia32":
98 "/trunk/deps/third_party/ffmpeg/binaries/win@25436", 99 "/trunk/deps/third_party/ffmpeg/binaries/win@" + Var("ffmpeg_revision"),
99 100
100 "src/third_party/pthreads-win32": 101 "src/third_party/pthreads-win32":
101 "/trunk/deps/third_party/pthreads-win32@26337", 102 "/trunk/deps/third_party/pthreads-win32@26337",
102 }, 103 },
103 "mac": { 104 "mac": {
104 "src/third_party/GTM": 105 "src/third_party/GTM":
105 "http://google-toolbox-for-mac.googlecode.com/svn/trunk@223", 106 "http://google-toolbox-for-mac.googlecode.com/svn/trunk@223",
106 "src/third_party/pdfsqueeze": 107 "src/third_party/pdfsqueeze":
107 "http://pdfsqueeze.googlecode.com/svn/trunk@2", 108 "http://pdfsqueeze.googlecode.com/svn/trunk@2",
108 "src/third_party/WebKit/WebKit/mac": 109 "src/third_party/WebKit/WebKit/mac":
109 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"), 110 Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
110 "src/third_party/WebKit/WebKitLibraries": 111 "src/third_party/WebKit/WebKitLibraries":
111 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"), 112 Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
112 "src/third_party/ffmpeg/binaries/chromium": 113
113 "/trunk/deps/third_party/ffmpeg/binaries/mac@25436", 114 "src/third_party/ffmpeg/binaries/chromium/mac/ia32":
115 "/trunk/deps/third_party/ffmpeg/binaries/mac@" + Var("ffmpeg_revision"),
116 "src/third_party/ffmpeg/binaries/chromium/mac/ia32_dbg":
117 "/trunk/deps/third_party/ffmpeg/binaries/mac_dbg@" +
118 Var("ffmpeg_revision"),
114 }, 119 },
115 "unix": { 120 "unix": {
116 # Linux, really. 121 # Linux, really.
117 "src/third_party/xdg-utils": 122 "src/third_party/xdg-utils":
118 "/trunk/deps/third_party/xdg-utils@26314", 123 "/trunk/deps/third_party/xdg-utils@26314",
119 "src/third_party/ffmpeg/binaries/chromium": 124
120 "/trunk/deps/third_party/ffmpeg/binaries/linux@25436", 125 "src/third_party/ffmpeg/binaries/chromium/linux/ia32":
126 "/trunk/deps/third_party/ffmpeg/binaries/linux@" +
127 Var("ffmpeg_revision"),
128 "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg":
129 "/trunk/deps/third_party/ffmpeg/binaries/linux_dbg@" +
130 Var("ffmpeg_revision"),
131
132 "src/third_party/ffmpeg/binaries/chromium/linux/x64":
133 "/trunk/deps/third_party/ffmpeg/binaries/linux_64@" +
134 Var("ffmpeg_revision"),
135 "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg":
136 "/trunk/deps/third_party/ffmpeg/binaries/linux_64_dbg@" +
137 Var("ffmpeg_revision"),
121 }, 138 },
122 } 139 }
123 140
124 141
125 include_rules = [ 142 include_rules = [
126 # Everybody can use some things. 143 # Everybody can use some things.
127 "+base", 144 "+base",
128 "+build", 145 "+build",
129 "+ipc", 146 "+ipc",
130 147
(...skipping 27 matching lines...) Expand all
158 # A change to a .gyp, .gypi, or to GYP itself should run the generator. 175 # A change to a .gyp, .gypi, or to GYP itself should run the generator.
159 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\ \\]build[/\\\\]gyp_chromium$", 176 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\ \\]build[/\\\\]gyp_chromium$",
160 "action": ["python", "src/build/gyp_chromium"], 177 "action": ["python", "src/build/gyp_chromium"],
161 }, 178 },
162 { 179 {
163 # Workaround IncrediBuild problem. http://crbug.com/17706. 180 # Workaround IncrediBuild problem. http://crbug.com/17706.
164 "pattern": "\\.grd$", 181 "pattern": "\\.grd$",
165 "action": ["python", "src/build/win/clobber_generated_headers.py", "$matchin g_files"], 182 "action": ["python", "src/build/win/clobber_generated_headers.py", "$matchin g_files"],
166 }, 183 },
167 ] 184 ]
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698