• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Android-x86 manifest


Commit MetaInfo

Revisión1f0176ca89b044f2768883a5434847f5be30cf5d (tree)
Tiempo2008-10-22 04:12:15
AutorShawn O. Pearce <sop@goog...>
CommiterShawn O. Pearce

Log Message

Merge branch 'master' into release-1.0

Cambiar Resumen

Diferencia incremental

--- a/default.xml
+++ b/default.xml
@@ -1,7 +1,7 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22 <manifest branch="release-1.0">
33 <remote name="korg"
4- fetch="git://android.kernel.org/"
4+ fetch="git://android.git.kernel.org/"
55 review="review.source.android.com" />
66 <default revision="release-1.0"
77 remote="korg" />
@@ -70,17 +70,17 @@
7070 <project path="external/bluez" name="platform/external/bluez">
7171 <import>
7272 <remap strip="bluez-%version%/" insert="hcidump/" />
73- <mirror url="http://bluez.sourceforge.net/download/bluez-%version%.tar.gz" />
73+ <mirror url="http://android.git.kernel.org/pub/bluez-%version%.tar.gz" />
7474 <snapshot version="hcidump-1.41" check="0bb62cf23a80ba45c904a309568a9f28ce0a3fae" />
7575 </import>
7676 <import>
7777 <remap strip="bluez-%version%/" insert="libs/" />
78- <mirror url="http://bluez.sourceforge.net/download/bluez-%version%.tar.gz" />
78+ <mirror url="http://android.git.kernel.org/pub/bluez-%version%.tar.gz" />
7979 <snapshot version="libs-3.35" check="26e3b6e34b5a30f7b6ba1fac24297c6a48e9f09c" />
8080 </import>
8181 <import>
8282 <remap strip="bluez-%version%/" insert="utils/" />
83- <mirror url="http://bluez.sourceforge.net/download/bluez-%version%.tar.gz" />
83+ <mirror url="http://android.git.kernel.org/pub/bluez-%version%.tar.gz" />
8484 <snapshot version="utils-3.35" check="809ce20070e58fb9fea39b56b693e422d32cbe5e" />
8585 </import>
8686 </project>
@@ -88,7 +88,7 @@
8888 <project path="external/clearsilver" name="platform/external/clearsilver">
8989 <import>
9090 <remap strip="clearsilver-%version%/" />
91- <mirror url="http://www.clearsilver.net/downloads/clearsilver-%version%.tar.gz" />
91+ <mirror url="http://android.git.kernel.org/pub/clearsilver-%version%.tar.gz" />
9292 <snapshot version="0.10.5" check="ec5fff5d7367ddd29a619cf81ae264687fde94c8" />
9393 </import>
9494 </project>
@@ -96,8 +96,7 @@
9696 <project path="external/dbus" name="platform/external/dbus">
9797 <import>
9898 <remap strip="dbus-%version%/" />
99- <mirror url="http://dbus.freedesktop.org/releases/dbus/dbus-1.0.2.tar.gz" />
100- <mirror url="ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/dbus-1.0.2.tar.gz" />
99+ <mirror url="http://android.git.kernel.org/pub/dbus-1.0.2.tar.gz" />
101100 <snapshot version="1.0.2" check="9993b61d2f46d048c725411d6862b64b5cb96672" />
102101 </import>
103102 </project>
@@ -107,8 +106,7 @@
107106 <project path="external/dropbear" name="platform/external/dropbear">
108107 <import>
109108 <remap strip="dropbear-%version%/" />
110- <mirror url="http://matt.ucc.asn.au/dropbear/releases/dropbear-%version%.tar.gz" />
111- <mirror url="http://matt.ucc.asn.au/dropbear/releases/dropbear-%version%.tar.bz2" />
109+ <mirror url="http://android.git.kernel.org/pub/dropbear-%version%.tar.gz" />
112110 <snapshot version="0.49" check="29698e296e3fd1474a362fbd229bca888175bb66" />
113111 </import>
114112 </project>
@@ -120,7 +118,7 @@
120118 <project path="external/emma" name="platform/external/emma">
121119 <import>
122120 <remap strip="emma-%version%/" />
123- <mirror url="http://downloads.sourceforge.net/emma/emma-%version%-src.zip" />
121+ <mirror url="http://android.git.kernel.org/pub/emma-%version%-src.zip" />
124122 <snapshot version="2.0.5312" check="a921fd048da6858dc24d4370e3bba15fc9cc69ca" />
125123 </import>
126124 </project>
@@ -130,7 +128,7 @@
130128 <project path="external/expat" name="platform/external/expat">
131129 <import>
132130 <remap strip="expat-%version%/" />
133- <mirror url="http://downloads.sourceforge.net/expat/expat-%version%.tar.gz" />
131+ <mirror url="http://android.git.kernel.org/pub/expat-%version%.tar.gz" />
134132 <snapshot version="2.0.0" check="5c19771335cf67c9955a5a58ea52dae9870a8035" />
135133 </import>
136134 </project>
@@ -140,7 +138,7 @@
140138 <project path="external/freetype" name="platform/external/freetype">
141139 <import>
142140 <remap strip="freetype-%version%/" />
143- <mirror url="http://download.savannah.gnu.org/releases/freetype/freetype-%version%.tar.bz2" />
141+ <mirror url="http://android.git.kernel.org/pub/freetype-%version%.tar.bz2" />
144142 <snapshot version="2.3.5" check="f463818dd9146e11105c0572fb119e757eb47768" />
145143 </import>
146144 </project>
@@ -150,8 +148,7 @@
150148 <project path="external/giflib" name="platform/external/giflib">
151149 <import>
152150 <remap strip="giflib-%version%/lib/" />
153- <mirror url="http://downloads.sourceforge.net/giflib/giflib-%version%.tar.gz" />
154- <mirror url="http://downloads.sourceforge.net/giflib/giflib-%version%.tar.bz2" />
151+ <mirror url="http://android.git.kernel.org/pub/giflib-%version%.tar.gz" />
155152 <snapshot version="4.1.6" check="1bc4596b116b3c829824c8b929ce48f864ca4a3c" />
156153 </import>
157154 </project>
@@ -161,16 +158,16 @@
161158 <project path="external/icu4c" name="platform/external/icu4c">
162159 <import>
163160 <remap strip="icu/source/" />
164- <mirror url="http://download.icu-project.org/files/icu4c/3.8/icu4c-%version%-src.tgz" />
161+ <mirror url="http://android.git.kernel.org/pub/icu4c-%version%-src.tgz" />
165162 <snapshot version="3_8" check="b45e1997d8af2b1f1f2862d01834776631657614" />
166163 </import>
167164 </project>
168165
169166 <project path="external/iptables" name="platform/external/iptables">
170167 <import>
171- <remap strip="iptables-%version%/./" />
172- <mirror url="ftp://ftp.netfilter.org/pub/iptables/iptables-%version%.tar.bz2" />
173- <snapshot version="1.3.7" check="7226fd9f7f7ebada706f9d040b39245ee8123faa" />
168+ <remap strip="iptables-%version%/" />
169+ <mirror url="http://android.git.kernel.org/pub/iptables-%version%.tar.bz2" />
170+ <snapshot version="1.3.7" check="058f8ee7bfe5eedf9104a12c0b2b109b872ebcb4" />
174171 </import>
175172 </project>
176173
@@ -181,7 +178,7 @@
181178 <project path="external/jpeg" name="platform/external/jpeg">
182179 <import>
183180 <remap strip="jpeg-%version%/" />
184- <mirror url="http://www.ijg.org/files/jpegsrc.v%version%.tar.gz" />
181+ <mirror url="http://android.git.kernel.org/pub/jpegsrc.v%version%.tar.gz" />
185182 <snapshot version="6b" check="c6a7fc661d57f86ac08cd637abc881cbe687b11a" />
186183 </import>
187184 </project>
@@ -190,17 +187,16 @@
190187
191188 <project path="external/libpcap" name="platform/external/libpcap">
192189 <import>
193- <remap strip="libpcap-%version%/./" />
194- <mirror url="http://www.tcpdump.org/release/libpcap-%version%.tar.gz" />
195- <snapshot version="0.9.8" check="29b0e71b7913664617f142fdbf22e3a5a0434f4b" />
190+ <remap strip="libpcap-%version%/" />
191+ <mirror url="http://android.git.kernel.org/pub/libpcap-%version%.tar.gz" />
192+ <snapshot version="0.9.8" check="7d4227ea78579803a5562f03e4b63790292caac3" />
196193 </import>
197194 </project>
198195
199196 <project path="external/libpng" name="platform/external/libpng">
200197 <import>
201198 <remap strip="libpng-%version%/" />
202- <mirror url="http://downloads.sourceforge.net/libpng/libpng-%version%.tar.gz" />
203- <mirror url="http://downloads.sourceforge.net/libpng/libpng-%version%.tar.bz2" />
199+ <mirror url="http://android.git.kernel.org/pub/libpng-%version%.tar.gz" />
204200 <snapshot version="1.2.29" check="0640679f04398a7d06319d5c47b0f71bf82854a0" />
205201 </import>
206202 </project>
@@ -208,7 +204,7 @@
208204 <project path="external/libxml2" name="platform/external/libxml2">
209205 <import>
210206 <remap strip="libxml2-%version%/" />
211- <mirror url="ftp://xmlsoft.org/libxml2/libxml2-sources-%version%.tar.gz" />
207+ <mirror url="http://android.git.kernel.org/pub/libxml2-sources-%version%.tar.gz" />
212208 <snapshot version="2.6.31" check="1b7783879f7122564e209c7124301e886079f393" />
213209 </import>
214210 </project>
@@ -216,7 +212,7 @@
216212 <project path="external/netcat" name="platform/external/netcat">
217213 <import>
218214 <remap />
219- <mirror url="http://freshmeat.net/redir/netcat/7041/url_tgz/nc%version%.tgz" />
215+ <mirror url="http://android.git.kernel.org/pub/nc%version%.tgz" />
220216 <snapshot version="110" check="d102598c3989239d749b86b0f49fa54554f54402" />
221217 </import>
222218 </project>
@@ -224,8 +220,7 @@
224220 <project path="external/netperf" name="platform/external/netperf">
225221 <import>
226222 <remap strip="netperf-%version%/src/" />
227- <mirror url="ftp://ftp.netperf.org/netperf/netperf-%version%.tar.gz" />
228- <mirror url="ftp://ftp.netperf.org/netperf/netperf-%version%.tar.bz2" />
223+ <mirror url="http://android.git.kernel.org/pub/netperf-%version%.tar.gz" />
229224 <snapshot version="2.4.4" check="8fbc7e6b026f40333767b2383bbaf0c5da473135" />
230225 </import>
231226 </project>
@@ -237,7 +232,7 @@
237232 <project path="external/openssl" name="platform/external/openssl">
238233 <import>
239234 <remap strip="openssl-%version%/" />
240- <mirror url="http://openssl.org/source/openssl-%version%.tar.gz" />
235+ <mirror url="http://android.git.kernel.org/pub/openssl-%version%.tar.gz" />
241236 <snapshot version="0.9.8h" check="bdfb8ad83da0647e9b9a32792598e8ce7ba3ef4d" />
242237 </import>
243238 </project>
@@ -245,7 +240,7 @@
245240 <project path="external/oprofile" name="platform/external/oprofile">
246241 <import>
247242 <remap strip="oprofile-%version%/" />
248- <mirror url="http://prdownloads.sourceforge.net/oprofile/oprofile-%version%.tar.gz" />
243+ <mirror url="http://android.git.kernel.org/pub/oprofile-%version%.tar.gz" />
249244 <snapshot version="0.9.1" check="cc2ee177dbb3befca43e36cfc56778b006c3d050" />
250245 </import>
251246 </project>
@@ -255,7 +250,7 @@
255250 <project path="external/ppp" name="platform/external/ppp">
256251 <import>
257252 <remap strip="ppp-%version%/pppd/" />
258- <mirror url="ftp://ftp.samba.org/pub/ppp/ppp-%version%.tar.gz" />
253+ <mirror url="http://android.git.kernel.org/pub/ppp-%version%.tar.gz" />
259254 <snapshot version="2.4.3" check="82c907af479178801a7a8701341b22c9d20fdb7e" />
260255 </import>
261256 </project>
@@ -265,7 +260,7 @@
265260 <project path="external/qemu" name="platform/external/qemu">
266261 <import>
267262 <remap strip="qemu-%version%/" />
268- <mirror url="http://bellard.org/qemu/qemu-%version%.tar.gz" />
263+ <mirror url="http://android.git.kernel.org/pub/qemu-%version%.tar.gz" />
269264 <snapshot version="0.8.2" check="413f05aaf54fa08c0ae7e997327a4f4a473c0a8d" />
270265 </import>
271266 </project>
@@ -273,7 +268,7 @@
273268 <project path="external/safe-iop" name="platform/external/safe-iop">
274269 <import>
275270 <remap strip="safe-iop-%version%/" />
276- <mirror url="http://safe-iop.googlecode.com/files/safe-iop-%version%.tgz" />
271+ <mirror url="http://android.git.kernel.org/pub/safe-iop-%version%.tgz" />
277272 <snapshot version="0.3.1" check="4fd37285a5ca04b18307255139e71603f55fd2fd" />
278273 </import>
279274 </project>
@@ -285,7 +280,7 @@
285280 <project path="external/sqlite" name="platform/external/sqlite">
286281 <import>
287282 <remap strip="sqlite-%version%/" insert="dist/" />
288- <mirror url="http://www.sqlite.org/sqlite-amalgamation-%version%.tar.gz" />
283+ <mirror url="http://android.git.kernel.org/pub/sqlite-amalgamation-%version%.tar.gz" />
289284 <snapshot version="3.6.3" check="6ca1d4f32da73eda41ba4925e98de4411cbe75d3" />
290285 </import>
291286 </project>
@@ -295,7 +290,7 @@
295290 <project path="external/strace" name="platform/external/strace">
296291 <import>
297292 <remap strip="strace-%version%/" />
298- <mirror url="http://downloads.sourceforge.net/strace/strace-%version%.tar.bz2" />
293+ <mirror url="http://android.git.kernel.org/pub/strace-%version%.tar.bz2" />
299294 <snapshot version="4.5.12" check="fa2c235113f9f310562b09097af5fa466a3158e0" />
300295 </import>
301296 </project>
@@ -303,24 +298,23 @@
303298 <project path="external/tagsoup" name="platform/external/tagsoup">
304299 <import>
305300 <remap strip="tagsoup-%version%/" />
306- <mirror url="http://android.kernel.org/pub/tagsoup-%version%-src.zip" />
307- <!-- http://home.ccil.org/~cowan/XML/tagsoup/tagsoup-%version%-src.zip -->
301+ <mirror url="http://android.git.kernel.org/pub/tagsoup-%version%-src.zip" />
308302 <snapshot version="1.2" check="70e83658cac1d0d766e93853e3698921af269a37" />
309303 </import>
310304 </project>
311305
312306 <project path="external/tcpdump" name="platform/external/tcpdump">
313307 <import>
314- <remap strip="tcpdump-%version%/./" />
315- <mirror url="http://www.tcpdump.org/release/tcpdump-%version%.tar.gz" />
316- <snapshot version="3.9.8" check="8e75e115f22403f5780a14917a874e99b8f7e51b" />
308+ <remap strip="tcpdump-%version%/" />
309+ <mirror url="http://android.git.kernel.org/pub/tcpdump-%version%.tar.gz" />
310+ <snapshot version="3.9.8" check="e66460324c0c1d5b6f767afeb6f3d201094156d3" />
317311 </import>
318312 </project>
319313
320314 <project path="external/tinyxml" name="platform/external/tinyxml">
321315 <import>
322316 <remap strip="tinyxml/" />
323- <mirror url="http://downloads.sourceforge.net/tinyxml/tinyxml_%version%.tar.gz" />
317+ <mirror url="http://android.git.kernel.org/pub/tinyxml_%version%.tar.gz" />
324318 <snapshot version="2_4_0" check="bc0ee9afa1072f1943b18f74560cb71840470597" />
325319 </import>
326320 </project>
@@ -336,7 +330,7 @@
336330 <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant">
337331 <import>
338332 <remap strip="wpa_supplicant-%version%/" />
339- <mirror url="http://hostap.epitest.fi/releases/wpa_supplicant-%version%.tar.gz" />
333+ <mirror url="http://android.git.kernel.org/pub/wpa_supplicant-%version%.tar.gz" />
340334 <snapshot version="0.5.10" check="10356433b643a2a5266f84a11ed4ac32d8c5c845" />
341335 </import>
342336 </project>
@@ -346,8 +340,7 @@
346340 <project path="external/zlib" name="platform/external/zlib">
347341 <import>
348342 <remap strip="zlib-%version%/" />
349- <mirror url="http://www.zlib.net/zlib-%version%.tar.bz2" />
350- <mirror url="http://voxel.dl.sourceforge.net/sourceforge/libpng/zlib-%version%.tar.gz" />
343+ <mirror url="http://android.git.kernel.org/pub/zlib-%version%.tar.bz2" />
351344 <snapshot version="1.2.3" check="b4ed8af31039b2aa9fab95ed19894498649a4f09" />
352345 </import>
353346 </project>