From ab043f72225b4f06a2b98b515270be854bcabee7 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Fri, 12 Oct 2012 15:52:20 +0200
Subject: manifest: (all) Use Linaro branch of maguro device configs

Change-Id: I218973ad0a7d60fd7870fcd1951fd565c27ae30f
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 2 +-
 landing-snowball.xml          | 2 +-
 linaro-default.xml            | 2 +-
 staging-galaxynexus.xml       | 2 +-
 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-lw.xml      | 2 +-
 tracking-vexpress-rtsm-mp.xml | 2 +-
 tracking-vexpress-tests.xml   | 2 +-
 tracking-vexpress.xml         | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/default.xml b/default.xml
index aa6a3f0..f8aacbb 100644
--- a/default.xml
+++ b/default.xml
@@ -138,6 +138,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
@@ -162,7 +163,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 48e0079..81a75ae 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -101,6 +101,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
@@ -171,7 +172,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 3e87957..bb9bbc9 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -100,6 +100,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -170,7 +171,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index f865f0b..bf0a5a3 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -132,6 +132,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
@@ -156,7 +157,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 4a3484e..d80e773 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -100,6 +100,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -170,7 +171,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 31877c5..f67aaaf 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -98,6 +98,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -167,7 +168,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 7b87749..8cae081 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -108,6 +108,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -178,7 +179,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index aff98bf..ccecbce 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -107,6 +107,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -177,7 +178,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index f41e9df..b636e62 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -100,6 +100,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -169,7 +170,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 47f8dec..47360e8 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -98,6 +98,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -166,7 +167,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 8e9a521..fe6787e 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -97,6 +97,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -166,7 +167,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index ffda9df..e8199be 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -100,6 +100,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
@@ -167,7 +168,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/tracking-vexpress-lw.xml b/tracking-vexpress-lw.xml
index 4cb45fc..8aff84e 100644
--- a/tracking-vexpress-lw.xml
+++ b/tracking-vexpress-lw.xml
@@ -102,6 +102,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -171,7 +172,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <!-- project path="device/samsung/torospr" name="device/samsung/torospr" / -->
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml
index f91c163..073a826 100644
--- a/tracking-vexpress-rtsm-mp.xml
+++ b/tracking-vexpress-rtsm-mp.xml
@@ -104,6 +104,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -174,7 +175,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml
index 3ec8860..16280dd 100644
--- a/tracking-vexpress-tests.xml
+++ b/tracking-vexpress-tests.xml
@@ -105,6 +105,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -174,7 +175,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 5b5b5ba..8329258 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -101,6 +101,7 @@
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
@@ -170,7 +171,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
-- 
cgit v1.2.3