manifest: (All) Use Linaro version of frameworks/ex

Fixes aliasing violations

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

11 files changed, 11 insertions, 11 deletions

diff --git a/default.xml b/default.xml
index bec01cae0..025e03128 100644
--- a/default.xml
+++ b/default.xml
@@ -97,10 +97,10 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1"/>
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1"/>
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="refs/tags/android-4.1.1_r4"/>
   <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
diff --git a/landing-snowball.xml b/landing-snowball.xml
index a1194f13a..657cd51b3 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -111,9 +111,9 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 78f30a379..b3f0afdd5 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -110,9 +110,9 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 59f2cd8dc..14d44da83 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -89,10 +89,10 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1"/>
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1"/>
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="refs/tags/android-4.1.1_r4"/>
   <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
diff --git a/staging-origen.xml b/staging-origen.xml
index 2150d8d86..61aac004d 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -110,9 +110,9 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 75ccab140..c78f1d167 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -108,11 +108,11 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" 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="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 7857bf32e..636dc8220 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -121,11 +121,11 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" 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="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index bedaefabc..fd7496f08 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -120,11 +120,11 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" 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="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 4566e0bc1..f40a80b87 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -111,11 +111,11 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" 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="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 96b07cda7..b192ee82d 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -107,11 +107,11 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" 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="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index e0132e7b8..3c5f9d16a 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -110,11 +110,11 @@
   <!-- Linaro modifications: Fix aliasing violations -->
   <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
   <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" 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="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />