From 8562822cc11c29a715616a96da5053c8e7b7bb06 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Sat, 29 Sep 2012 14:32:18 +0159
Subject: manifest: (All) use android-4.1.1_r6

Use android-4.1.1_r6 for projects that don't have a Linaro branch

Change-Id: Ifc302feafdd01dcf9944525da276c9823c59382d
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 14 +++++++-------
 landing-snowball.xml          |  2 +-
 linaro-default.xml            |  2 +-
 staging-galaxynexus.xml       | 14 +++++++-------
 staging-origen.xml            |  2 +-
 staging-panda.xml             |  2 +-
 staging-vexpress-rtsm-isw.xml |  2 +-
 staging-vexpress-rtsm.xml     |  2 +-
 staging-vexpress.xml          |  2 +-
 tracking-origen.xml           |  2 +-
 tracking-panda.xml            |  2 +-
 tracking-snowball.xml         |  2 +-
 tracking-vexpress-rtsm-mp.xml |  2 +-
 tracking-vexpress-tests.xml   |  2 +-
 tracking-vexpress.xml         |  2 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/default.xml b/default.xml
index 8b719e4..b066aaf 100644
--- a/default.xml
+++ b/default.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
@@ -123,17 +123,17 @@
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Need porting -->
-  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.1_r4" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.1_r6" />
   <!-- Linaro modifications: Add ECM -->
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
-  <project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r4" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r4" />
-  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r4" />
-  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.1_r4" />
+  <project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r6" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r6" />
+  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r6" />
+  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.1_r6" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.1_r4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.1_r6" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 56ded4f..ad68dfe 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/linaro-default.xml b/linaro-default.xml
index 4750281..51f3305 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -12,7 +12,7 @@
 	   fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 0cebb3e..8976080 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
@@ -113,20 +113,20 @@
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Need porting -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.1.1" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.1_r4" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.1_r6" />
   <!-- Linaro modifications: Add ECM -->
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
-  <project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r4" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r4" />
-  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r4" />
-  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.1_r4" />
+  <project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r6" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r6" />
+  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r6" />
+  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.1_r6" />
   <!-- Linaro modifications: ISO C++11 support -->
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.1_r4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.1_r6" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
diff --git a/staging-origen.xml b/staging-origen.xml
index 74ef00c..b99a26e 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/staging-panda.xml b/staging-panda.xml
index 055eed6..b923240 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 0dbd4a3..ae96426 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -14,7 +14,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 12987b1..c2f209b 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 66286b9..8b6c7d0 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/tracking-origen.xml b/tracking-origen.xml
index ca791d7..ee671a7 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 4f6af65..f11a11b 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index 7675b21..707cc1e 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml
index 69621a2..ceaa4b0 100644
--- a/tracking-vexpress-rtsm-mp.xml
+++ b/tracking-vexpress-rtsm-mp.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml
index b7c9801..38d2507 100644
--- a/tracking-vexpress-tests.xml
+++ b/tracking-vexpress-tests.xml
@@ -14,7 +14,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 7bd2f7c..1c7143f 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r4"
+  <default revision="refs/tags/android-4.1.1_r6"
            remote="aosp"
            sync-j="4" />
 
-- 
cgit v1.2.3