change some projects to use branch froyo-plus-aosp

Some x86 specific patches are already in froyo-plus-aosp.

diff --git a/default.xml b/default.xml
index 702a77e..695f7c5 100644 (file)
--- a/default.xml
+++ b/default.xml
@@ -30,13 +30,10 @@
   <project path="external/mesa" name="platform/external/mesa" remote="x86" revision="froyo-x86" />
   <project path="external/mplayer" name="platform/external/mplayer" remote="x86" revision="froyo-x86" />
   <project path="external/ppp" name="platform/external/ppp" remote="x86" revision="froyo-x86" />
-  <project path="external/stlport" name="platform/external/stlport" remote="x86" revision="froyo-x86" />
-  <project path="external/tremolo" name="platform/external/tremolo" remote="x86" revision="froyo-x86" />
   <project path="external/tslib" name="platform/external/tslib" remote="x86" revision="froyo-x86" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" remote="x86" revision="froyo-x86" />
   <project path="frameworks/base" name="platform/frameworks/base" remote="x86" revision="froyo-x86" />
   <project path="frameworks/policies/base" name="platform/frameworks/policies/base" remote="x86" revision="froyo-x86" />
-  <project path="hardware/intel/i915" name="platform/hardware/intel/i915" remote="x86" revision="froyo-x86" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" remote="x86" revision="froyo-x86" />
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" remote="x86" revision="froyo-x86" />
   <project path="hardware/ril" name="platform/hardware/ril" remote="x86" revision="froyo-x86" />
@@ -115,7 +112,7 @@
   <project path="external/netcat" name="platform/external/netcat" />
   <project path="external/netperf" name="platform/external/netperf" />
   <project path="external/neven" name="platform/external/neven" />
-  <project path="external/opencore" name="platform/external/opencore" />
+  <project path="external/opencore" name="platform/external/opencore" revision="froyo-plus-aosp" />
   <project path="external/openssl" name="platform/external/openssl" />
   <project path="external/oprofile" name="platform/external/oprofile" />
   <project path="external/ping" name="platform/external/ping" />
@@ -127,13 +124,15 @@
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srec" name="platform/external/srec" />
+  <project path="external/stlport" name="platform/external/stlport" revision="froyo-plus-aosp" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/svox" name="platform/external/svox" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="froyo-plus-aosp" />
   <project path="external/v8" name="platform/external/v8" />
-  <project path="external/webkit" name="platform/external/webkit" />
+  <project path="external/webkit" name="platform/external/webkit" revision="froyo-plus-aosp" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/zlib" name="platform/external/zlib" />