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>
---
 staging-vexpress.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'staging-vexpress.xml')

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" />
-- 
cgit v1.2.3