Merge "manifests: (All) Use Linaro branch of embunit" into linaro_android_4.1.1

11 files changed, 11 insertions, 11 deletions

diff --git a/default.xml b/default.xml
index 2d318bf..03c97d6 100644
--- a/default.xml
+++ b/default.xml
@@ -112,6 +112,7 @@
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need to be restored -->
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
@@ -132,7 +133,6 @@
   <!-- 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="external/embunit" name="platform/external/embunit" 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_r4" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 6230a59..f3764b4 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -127,6 +127,7 @@
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
@@ -138,7 +139,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 37a0190..708bf04 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -124,6 +124,7 @@
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
@@ -135,7 +136,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index feede26..3d67b70 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -97,6 +97,7 @@
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need to be restored -->
   <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
@@ -125,7 +126,6 @@
   <!-- 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="external/embunit" name="platform/external/embunit" 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_r4" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
diff --git a/staging-origen.xml b/staging-origen.xml
index a0caef0..0c1a683 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -124,6 +124,7 @@
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
@@ -137,7 +138,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 6456c09..4a56542 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -119,6 +119,7 @@
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -138,7 +139,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 2a2bffc..fec3c78 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -132,6 +132,7 @@
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -151,7 +152,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 9768d05..49288a3 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -132,6 +132,7 @@
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -150,7 +151,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 977da97..9b24afe 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -123,6 +123,7 @@
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -141,7 +142,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 7235744..fb3f60a 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -119,6 +119,7 @@
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -137,7 +138,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 4ab14c9..41656a8 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -122,6 +122,7 @@
   <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -140,7 +141,6 @@
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="external/webkit" name="platform/external/webkit" />
-  <project path="external/embunit" name="platform/external/embunit" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />