From 8fda2e6a1c43ededec90f4c86c9f2352a7f6079a Mon Sep 17 00:00:00 2001
From: John Ford <john@johnford.info>
Date: Wed, 6 Mar 2013 16:35:38 -0800
Subject: [PATCH] bug 848559 - switch panda and emu to caf, stop using linaro
 for gtest on caf devices r=mwu (cherry picked from commit
 76050ae6fbab6631418465fb8c778a6406115c35)

---
 emulator.xml   | 4 ++--
 otoro.xml      | 3 +--
 pandaboard.xml | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emulator.xml b/emulator.xml
index 12bc0f5d0..e120b383b 100644
--- a/emulator.xml
+++ b/emulator.xml
@@ -2,11 +2,11 @@
 <manifest>
 
   <remote name="aosp" fetch="https://android.googlesource.com/"/>
-  <remote name="linaro" fetch="http://android.git.linaro.org/git-ro/"/>
   <remote name="b2g" fetch="https://git.mozilla.org/b2g"/>
+  <remote name="caf" fetch="git://codeaurora.org/"/>
   <remote name="mozilla" fetch="git://github.com/mozilla/"/>
   <remote name="mozillaorg" fetch="https://git.mozilla.org/releases"/>
-  <default revision="refs/tags/android-4.0.4_r2.1" remote="linaro" sync-j="4"/>
+  <default revision="refs/tags/android-4.0.4_r2.1" remote="caf" sync-j="4"/>
 
   <!-- Gonk specific things and forks -->
   <project path="build" name="platform_build" remote="b2g" revision="43434d6cdbf702e6197e0791f19406860284edf6" upstream="v1.0.1">
diff --git a/otoro.xml b/otoro.xml
index fc423b28a..5423571f8 100644
--- a/otoro.xml
+++ b/otoro.xml
@@ -5,7 +5,6 @@
   <remote name="b2g" fetch="https://git.mozilla.org/b2g"/>
   <remote name="mozilla" fetch="git://github.com/mozilla/"/>
   <remote name="caf" fetch="git://codeaurora.org/"/>
-  <remote name="linaro" fetch="http://android.git.linaro.org/git-ro/"/>
   <remote name="mozillaorg" fetch="https://git.mozilla.org/releases"/>
   <default revision="ics_chocolate_rb4.2" remote="caf" sync-j="4"/>
 
@@ -43,7 +42,7 @@
   <project path="external/flac" name="platform/external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
   <project path="external/freetype" name="platform/external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
   <project path="external/giflib" name="platform/external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
-  <project path="external/gtest" name="platform/external/gtest" remote="linaro" revision="344e5f3db17615cc853073a02968a603efd39109"/>
+  <project path="external/gtest" name="platform/external/gtest" revision="344e5f3db17615cc853073a02968a603efd39109"/>
   <project path="external/harfbuzz" name="platform/external/harfbuzz" revision="116610d63a859521dacf00fb6818ee9ab2e666f6"/>
   <project path="external/icu4c" name="platform/external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
   <project path="external/iptables" name="platform/external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
diff --git a/pandaboard.xml b/pandaboard.xml
index 38c669cc5..df511ac35 100644
--- a/pandaboard.xml
+++ b/pandaboard.xml
@@ -4,9 +4,10 @@
   <remote name="aosp" fetch="https://android.googlesource.com/"/>
   <remote name="b2g" fetch="git://github.com/mozilla-b2g/"/>
   <remote name="linaro" fetch="http://android.git.linaro.org/git-ro/"/>
+  <remote name="caf" fetch="git://codeaurora.org/"/>
   <remote name="mozilla" fetch="git://github.com/mozilla/"/>
   <remote name="mozillaorg" fetch="https://git.mozilla.org/releases"/>
-  <default revision="refs/tags/android-4.0.4_r2.1" remote="linaro" sync-j="4"/>
+  <default revision="refs/tags/android-4.0.4_r2.1" remote="caf" sync-j="4"/>
 
   <!-- Gonk specific things and forks -->
   <project path="build" name="platform_build" remote="b2g" revision="43434d6cdbf702e6197e0791f19406860284edf6" upstream="v1.0.1">
@@ -40,7 +41,7 @@
   <project path="external/flac" name="platform/external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
   <project path="external/freetype" name="platform/external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
   <project path="external/giflib" name="platform/external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
-  <project path="external/gtest" name="platform/external/gtest" remote="linaro" revision="344e5f3db17615cc853073a02968a603efd39109"/>
+  <project path="external/gtest" name="platform/external/gtest" revision="344e5f3db17615cc853073a02968a603efd39109"/>
   <project path="external/harfbuzz" name="platform/external/harfbuzz" revision="bae491c03a00757d83ede8d855b7d85d246bde3d"/>
   <project path="external/icu4c" name="platform/external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
   <project path="external/iptables" name="platform/external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>