manifest: (all) Use Linaro branch of maguro device configs

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

16 files changed, 16 insertions, 16 deletions

diff --git a/default.xml b/default.xml
index aa6a3f00e..f8aacbb13 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 48e0079b6..81a75ae59 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 3e8795713..bb9bbc951 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 f865f0b7d..bf0a5a3b3 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 4a3484e76..d80e7731c 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 31877c58f..f67aaafe4 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 7b8774906..8cae08113 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 aff98bfde..ccecbce3b 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 f41e9df08..b636e626b 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 47f8decbf..47360e8fa 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 8e9a52175..fe6787e4c 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 ffda9df93..e8199be64 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 4cb45fc22..8aff84e18 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 f91c163c8..073a826ad 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 3ec88608b..16280dde6 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 5b5b5bafd..8329258b0 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" />