• 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ónbcf40054e1c69a9439d771090222efecda747c88 (tree)
Tiempo2008-11-07 01:34:42
AutorShawn O. Pearce <sop@goog...>
CommiterShawn O. Pearce

Log Message

Merge branch 'master' into release-1.0

* master:

Remove now-defunct <snapshot> entries from the manifest
Remove hardcoded branch constant

Conflicts:
default.xml

Cambiar Resumen

Diferencia incremental

--- a/default.xml
+++ b/default.xml
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="UTF-8"?>
2-<manifest branch="release-1.0">
2+<manifest>
33 <remote name="korg"
44 fetch="git://android.git.kernel.org/"
55 review="review.source.android.com" />
@@ -64,286 +64,53 @@
6464 <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
6565
6666 <project path="external/aes" name="platform/external/aes" />
67-
6867 <project path="external/apache-http" name="platform/external/apache-http" />
69-
70- <project path="external/bluez" name="platform/external/bluez">
71- <import>
72- <remap strip="bluez-%version%/" insert="hcidump/" />
73- <mirror url="http://android.git.kernel.org/pub/bluez-%version%.tar.gz" />
74- <snapshot version="hcidump-1.41" check="0bb62cf23a80ba45c904a309568a9f28ce0a3fae" />
75- </import>
76- <import>
77- <remap strip="bluez-%version%/" insert="libs/" />
78- <mirror url="http://android.git.kernel.org/pub/bluez-%version%.tar.gz" />
79- <snapshot version="libs-3.35" check="26e3b6e34b5a30f7b6ba1fac24297c6a48e9f09c" />
80- </import>
81- <import>
82- <remap strip="bluez-%version%/" insert="utils/" />
83- <mirror url="http://android.git.kernel.org/pub/bluez-%version%.tar.gz" />
84- <snapshot version="utils-3.35" check="809ce20070e58fb9fea39b56b693e422d32cbe5e" />
85- </import>
86- </project>
87-
88- <project path="external/clearsilver" name="platform/external/clearsilver">
89- <import>
90- <remap strip="clearsilver-%version%/" />
91- <mirror url="http://android.git.kernel.org/pub/clearsilver-%version%.tar.gz" />
92- <snapshot version="0.10.5" check="ec5fff5d7367ddd29a619cf81ae264687fde94c8" />
93- </import>
94- </project>
95-
96- <project path="external/dbus" name="platform/external/dbus">
97- <import>
98- <remap strip="dbus-%version%/" />
99- <mirror url="http://android.git.kernel.org/pub/dbus-1.0.2.tar.gz" />
100- <snapshot version="1.0.2" check="9993b61d2f46d048c725411d6862b64b5cb96672" />
101- </import>
102- </project>
103-
68+ <project path="external/bluez" name="platform/external/bluez" />
69+ <project path="external/clearsilver" name="platform/external/clearsilver" />
70+ <project path="external/dbus" name="platform/external/dbus" />
10471 <project path="external/dhcpcd" name="platform/external/dhcpcd" />
105-
106- <project path="external/dropbear" name="platform/external/dropbear">
107- <import>
108- <remap strip="dropbear-%version%/" />
109- <mirror url="http://android.git.kernel.org/pub/dropbear-%version%.tar.gz" />
110- <snapshot version="0.49" check="29698e296e3fd1474a362fbd229bca888175bb66" />
111- </import>
112- </project>
113-
72+ <project path="external/dropbear" name="platform/external/dropbear" />
11473 <project path="external/elfcopy" name="platform/external/elfcopy" />
115-
11674 <project path="external/elfutils" name="platform/external/elfutils" />
117-
118- <project path="external/emma" name="platform/external/emma">
119- <import>
120- <remap strip="emma-%version%/" />
121- <mirror url="http://android.git.kernel.org/pub/emma-%version%-src.zip" />
122- <snapshot version="2.0.5312" check="a921fd048da6858dc24d4370e3bba15fc9cc69ca" />
123- </import>
124- </project>
125-
75+ <project path="external/emma" name="platform/external/emma" />
12676 <project path="external/esd" name="platform/external/esd" />
127-
128- <project path="external/expat" name="platform/external/expat">
129- <import>
130- <remap strip="expat-%version%/" />
131- <mirror url="http://android.git.kernel.org/pub/expat-%version%.tar.gz" />
132- <snapshot version="2.0.0" check="5c19771335cf67c9955a5a58ea52dae9870a8035" />
133- </import>
134- </project>
135-
77+ <project path="external/expat" name="platform/external/expat" />
13678 <project path="external/fdlibm" name="platform/external/fdlibm" />
137-
138- <project path="external/freetype" name="platform/external/freetype">
139- <import>
140- <remap strip="freetype-%version%/" />
141- <mirror url="http://android.git.kernel.org/pub/freetype-%version%.tar.bz2" />
142- <snapshot version="2.3.5" check="f463818dd9146e11105c0572fb119e757eb47768" />
143- </import>
144- </project>
145-
79+ <project path="external/freetype" name="platform/external/freetype" />
14680 <project path="external/gdata" name="platform/external/gdata" />
147-
148- <project path="external/giflib" name="platform/external/giflib">
149- <import>
150- <remap strip="giflib-%version%/lib/" />
151- <mirror url="http://android.git.kernel.org/pub/giflib-%version%.tar.gz" />
152- <snapshot version="4.1.6" check="1bc4596b116b3c829824c8b929ce48f864ca4a3c" />
153- </import>
154- </project>
155-
81+ <project path="external/giflib" name="platform/external/giflib" />
15682 <project path="external/googleclient" name="platform/external/googleclient" />
157-
158- <project path="external/icu4c" name="platform/external/icu4c">
159- <import>
160- <remap strip="icu/source/" />
161- <mirror url="http://android.git.kernel.org/pub/icu4c-%version%-src.tgz" />
162- <snapshot version="3_8" check="b45e1997d8af2b1f1f2862d01834776631657614" />
163- </import>
164- </project>
165-
166- <project path="external/iptables" name="platform/external/iptables">
167- <import>
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" />
171- </import>
172- </project>
173-
83+ <project path="external/icu4c" name="platform/external/icu4c" />
84+ <project path="external/iptables" name="platform/external/iptables" />
17485 <project path="external/jdiff" name="platform/external/jdiff" />
175-
17686 <project path="external/jhead" name="platform/external/jhead" />
177-
178- <project path="external/jpeg" name="platform/external/jpeg">
179- <import>
180- <remap strip="jpeg-%version%/" />
181- <mirror url="http://android.git.kernel.org/pub/jpegsrc.v%version%.tar.gz" />
182- <snapshot version="6b" check="c6a7fc661d57f86ac08cd637abc881cbe687b11a" />
183- </import>
184- </project>
185-
87+ <project path="external/jpeg" name="platform/external/jpeg" />
18688 <project path="external/libffi" name="platform/external/libffi" />
187-
188- <project path="external/libpcap" name="platform/external/libpcap">
189- <import>
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" />
193- </import>
194- </project>
195-
196- <project path="external/libpng" name="platform/external/libpng">
197- <import>
198- <remap strip="libpng-%version%/" />
199- <mirror url="http://android.git.kernel.org/pub/libpng-%version%.tar.gz" />
200- <snapshot version="1.2.29" check="0640679f04398a7d06319d5c47b0f71bf82854a0" />
201- </import>
202- </project>
203-
204- <project path="external/libxml2" name="platform/external/libxml2">
205- <import>
206- <remap strip="libxml2-%version%/" />
207- <mirror url="http://android.git.kernel.org/pub/libxml2-sources-%version%.tar.gz" />
208- <snapshot version="2.6.31" check="1b7783879f7122564e209c7124301e886079f393" />
209- </import>
210- </project>
211-
212- <project path="external/netcat" name="platform/external/netcat">
213- <import>
214- <remap />
215- <mirror url="http://android.git.kernel.org/pub/nc%version%.tgz" />
216- <snapshot version="110" check="d102598c3989239d749b86b0f49fa54554f54402" />
217- </import>
218- </project>
219-
220- <project path="external/netperf" name="platform/external/netperf">
221- <import>
222- <remap strip="netperf-%version%/src/" />
223- <mirror url="http://android.git.kernel.org/pub/netperf-%version%.tar.gz" />
224- <snapshot version="2.4.4" check="8fbc7e6b026f40333767b2383bbaf0c5da473135" />
225- </import>
226- </project>
227-
89+ <project path="external/libpcap" name="platform/external/libpcap" />
90+ <project path="external/libpng" name="platform/external/libpng" />
91+ <project path="external/libxml2" name="platform/external/libxml2" />
92+ <project path="external/netcat" name="platform/external/netcat" />
93+ <project path="external/netperf" name="platform/external/netperf" />
22894 <project path="external/neven" name="platform/external/neven" />
229-
23095 <project path="external/opencore" name="platform/external/opencore" />
231-
232- <project path="external/openssl" name="platform/external/openssl">
233- <import>
234- <remap strip="openssl-%version%/" />
235- <mirror url="http://android.git.kernel.org/pub/openssl-%version%.tar.gz" />
236- <snapshot version="0.9.8h" check="bdfb8ad83da0647e9b9a32792598e8ce7ba3ef4d" />
237- </import>
238- </project>
239-
240- <project path="external/oprofile" name="platform/external/oprofile">
241- <import>
242- <remap strip="oprofile-%version%/" />
243- <mirror url="http://android.git.kernel.org/pub/oprofile-%version%.tar.gz" />
244- <snapshot version="0.9.1" check="cc2ee177dbb3befca43e36cfc56778b006c3d050" />
245- </import>
246- </project>
247-
96+ <project path="external/openssl" name="platform/external/openssl" />
97+ <project path="external/oprofile" name="platform/external/oprofile" />
24898 <project path="external/ping" name="platform/external/ping" />
249-
250- <project path="external/ppp" name="platform/external/ppp">
251- <import>
252- <remap strip="ppp-%version%/pppd/" />
253- <mirror url="http://android.git.kernel.org/pub/ppp-%version%.tar.gz" />
254- <snapshot version="2.4.3" check="82c907af479178801a7a8701341b22c9d20fdb7e" />
255- </import>
256- </project>
257-
99+ <project path="external/ppp" name="platform/external/ppp" />
258100 <project path="external/protobuf" name="platform/external/protobuf" />
259-
260- <project path="external/qemu" name="platform/external/qemu">
261- <import>
262- <remap strip="qemu-%version%/" />
263- <mirror url="http://android.git.kernel.org/pub/qemu-%version%.tar.gz" />
264- <snapshot version="0.8.2" check="413f05aaf54fa08c0ae7e997327a4f4a473c0a8d" />
265- </import>
266- </project>
267-
268- <project path="external/safe-iop" name="platform/external/safe-iop">
269- <import>
270- <remap strip="safe-iop-%version%/" />
271- <mirror url="http://android.git.kernel.org/pub/safe-iop-%version%.tgz" />
272- <snapshot version="0.3.1" check="4fd37285a5ca04b18307255139e71603f55fd2fd" />
273- </import>
274- </project>
275-
101+ <project path="external/qemu" name="platform/external/qemu" />
102+ <project path="external/safe-iop" name="platform/external/safe-iop" />
276103 <project path="external/skia" name="platform/external/skia" />
277-
278104 <project path="external/sonivox" name="platform/external/sonivox" />
279-
280- <project path="external/sqlite" name="platform/external/sqlite">
281- <import>
282- <remap strip="sqlite-%version%/" insert="dist/" />
283- <mirror url="http://android.git.kernel.org/pub/sqlite-amalgamation-%version%.tar.gz" />
284- <snapshot version="3.6.3" check="6ca1d4f32da73eda41ba4925e98de4411cbe75d3" />
285- </import>
286- </project>
287-
105+ <project path="external/sqlite" name="platform/external/sqlite" />
288106 <project path="external/srec" name="platform/external/srec" />
289-
290- <project path="external/strace" name="platform/external/strace">
291- <import>
292- <remap strip="strace-%version%/" />
293- <mirror url="http://android.git.kernel.org/pub/strace-%version%.tar.bz2" />
294- <snapshot version="4.5.12" check="fa2c235113f9f310562b09097af5fa466a3158e0" />
295- </import>
296- </project>
297-
298- <project path="external/tagsoup" name="platform/external/tagsoup">
299- <import>
300- <remap strip="tagsoup-%version%/" />
301- <mirror url="http://android.git.kernel.org/pub/tagsoup-%version%-src.zip" />
302- <snapshot version="1.2" check="70e83658cac1d0d766e93853e3698921af269a37" />
303- </import>
304- </project>
305-
306- <project path="external/tcpdump" name="platform/external/tcpdump">
307- <import>
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" />
311- </import>
312- </project>
313-
314- <project path="external/tinyxml" name="platform/external/tinyxml">
315- <import>
316- <remap strip="tinyxml/" />
317- <mirror url="http://android.git.kernel.org/pub/tinyxml_%version%.tar.gz" />
318- <snapshot version="2_4_0" check="bc0ee9afa1072f1943b18f74560cb71840470597" />
319- </import>
320- </project>
321-
107+ <project path="external/strace" name="platform/external/strace" />
108+ <project path="external/tagsoup" name="platform/external/tagsoup" />
109+ <project path="external/tcpdump" name="platform/external/tcpdump" />
110+ <project path="external/tinyxml" name="platform/external/tinyxml" />
322111 <project path="external/tremor" name="platform/external/tremor" />
323-
324- <project path="external/webkit" name="platform/external/webkit">
325- <import>
326- <remap strip="WebKit-%version%/" />
327- <mirror url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-%version%.tar.bz2" />
328- <snapshot version="r30707" check="d8543bb6618c17b12da906afa77d216f58cf4058" />
329- </import>
330- </project>
331-
332- <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant">
333- <import>
334- <remap strip="wpa_supplicant-%version%/" />
335- <mirror url="http://android.git.kernel.org/pub/wpa_supplicant-%version%.tar.gz" />
336- <snapshot version="0.5.10" check="10356433b643a2a5266f84a11ed4ac32d8c5c845" />
337- </import>
338- </project>
339-
112+ <project path="external/webkit" name="platform/external/webkit" />
113+ <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
340114 <project path="external/yaffs2" name="platform/external/yaffs2" />
341-
342- <project path="external/zlib" name="platform/external/zlib">
343- <import>
344- <remap strip="zlib-%version%/" />
345- <mirror url="http://android.git.kernel.org/pub/zlib-%version%.tar.bz2" />
346- <snapshot version="1.2.3" check="b4ed8af31039b2aa9fab95ed19894498649a4f09" />
347- </import>
348- </project>
115+ <project path="external/zlib" name="platform/external/zlib" />
349116 </manifest>