manifest: Use linaro versions of tremolo and freetype

We have to make adjustments to the tremolo and freetype build
processes to take advantage of current toolchain improvements.
Pull those 2 projects from the Linaro repository and use the
Linaro branches.

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

7 files changed, 14 insertions, 14 deletions

diff --git a/default.xml b/default.xml
index d7e25a94a..ce7170704 100644
--- a/default.xml
+++ b/default.xml
@@ -37,6 +37,7 @@
 
   <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
   <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -47,6 +48,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
 
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -118,7 +120,6 @@
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
@@ -160,7 +161,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
   <project path="external/v8" name="platform/external/v8" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index e23fc398a..8fc475415 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -38,6 +38,7 @@
 
   <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
   <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -48,6 +49,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -121,7 +123,6 @@
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
@@ -162,7 +163,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
   <project path="external/v8" name="platform/external/v8" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 1671b2e15..854039b40 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -41,6 +41,7 @@
 
   <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
   <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -51,6 +52,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
 
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -130,7 +132,6 @@
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
@@ -171,7 +172,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
   <project path="external/v8" name="platform/external/v8" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 9253be15a..3061f127e 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -38,6 +38,7 @@
 
   <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
   <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -48,6 +49,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -123,7 +125,6 @@
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
@@ -164,7 +165,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
   <project path="external/v8" name="platform/external/v8" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 488301661..b8137f1b9 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -37,6 +37,7 @@
 
   <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
   <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -47,6 +48,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -130,7 +132,6 @@
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
@@ -171,7 +172,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
   <project path="external/v8" name="platform/external/v8" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index bc621210a..01f7e67aa 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -38,6 +38,7 @@
 
   <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
   <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -48,6 +49,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -121,7 +123,6 @@
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
@@ -162,7 +163,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
   <project path="external/v8" name="platform/external/v8" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 505d0bf8d..f5183c413 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -37,6 +37,7 @@
 
   <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
   <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -47,6 +48,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
@@ -130,7 +132,6 @@
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
@@ -171,7 +172,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
   <project path="external/v8" name="platform/external/v8" />
   <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />