From a4277650a6ef156096755a710f7dca9598941974 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Wed, 15 Aug 2012 22:17:41 +0200
Subject: manifest: (All) Use Linaro branch of slang

Fixes violations of aliasing rules

Change-Id: I714ff0bfe68214f27e8ee45598254f4c92a2af82
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 3 +--
 landing-snowball.xml          | 2 +-
 linaro-default.xml            | 2 +-
 staging-galaxynexus.xml       | 3 +--
 staging-origen.xml            | 2 +-
 staging-panda.xml             | 2 +-
 staging-vexpress-rtsm-isw.xml | 2 +-
 staging-vexpress-rtsm.xml     | 2 +-
 staging-vexpress.xml          | 2 +-
 tracking-panda.xml            | 2 +-
 tracking-vexpress.xml         | 2 +-
 11 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/default.xml b/default.xml
index 1d0e6ec..79416ca 100644
--- a/default.xml
+++ b/default.xml
@@ -73,8 +73,6 @@
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: New init.rc, various bugfixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="refs/tags/android-4.1.1_r4" />
   <!-- Linaro modifications: Increase maximum number of partitions -->
   <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
@@ -102,6 +100,7 @@
   <project path="external/chromium" name="platform/external/chromium" 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/compile/slang" name="platform/frameworks/compile/slang" 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 -->
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 904fcfd..d24c372 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -102,7 +102,6 @@
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -118,6 +117,7 @@
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 5742cb7..083f89c 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -101,7 +101,6 @@
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -117,6 +116,7 @@
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index c889b5a..6c61570 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -65,8 +65,6 @@
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: New init.rc, various bugfixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="refs/tags/android-4.1.1_r4" />
   <!-- Linaro modifications: Increase maximum number of partitions -->
   <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
@@ -94,6 +92,7 @@
   <project path="external/chromium" name="platform/external/chromium" 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/compile/slang" name="platform/frameworks/compile/slang" 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 -->
diff --git a/staging-origen.xml b/staging-origen.xml
index fac9a3c..6714ac7 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -101,7 +101,6 @@
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -117,6 +116,7 @@
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/staging-panda.xml b/staging-panda.xml
index d0cba94..ee122e2 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -99,7 +99,6 @@
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -117,6 +116,7 @@
   <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" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index c4e6d77..81d987f 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -112,7 +112,6 @@
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
 
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -130,6 +129,7 @@
   <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" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index c9351b9..d91af3b 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -111,7 +111,6 @@
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
 
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -129,6 +128,7 @@
   <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" />
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index affa474..2f27504 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -102,7 +102,6 @@
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -116,6 +115,7 @@
   <project path="external/chromium" name="platform/external/chromium" 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/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index c073f8a..832f367 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -98,7 +98,6 @@
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -112,6 +111,7 @@
   <project path="external/chromium" name="platform/external/chromium" 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/compile/slang" name="platform/frameworks/compile/slang" 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" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index faadb5d..0161b10 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -101,7 +101,6 @@
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="external/srec" name="platform/external/srec" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
@@ -115,6 +114,7 @@
   <project path="external/chromium" name="platform/external/chromium" 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/compile/slang" name="platform/frameworks/compile/slang" 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" />
-- 
cgit v1.2.1