From cefcb8af382253f497f1109ed632ebd54fd610f9 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Sun, 12 Aug 2012 21:43:29 +0200
Subject: manifest (All): Use new Linaro branches of various projects

This switches the following subprojects over to Linaro branches:
- libhardware_legacy
- freetype
- sonivox
- openssl

Change-Id: Ife6ab1161c6c7105e3147b324abca8b27d2e67a9
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 staging-origen.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'staging-origen.xml')

diff --git a/staging-origen.xml b/staging-origen.xml
index 83a0535..4317fe5 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -76,8 +76,9 @@
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
   <project path="bionic" name="platform/bionic" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: gcc 4.7 support -->
+  <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.1"/>
+  <!-- Linaro modifications: gcc 4.7 support -->
   <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.1" />
   <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.1" />
   <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.1" />
@@ -102,10 +103,14 @@
   <!-- 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" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/sonivox" name="platform/external/sonivox" />
-  <project path="external/openssl" name="platform/external/openssl" />
+  <!-- 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" />
+  <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Fix aliasing violations -->
+  <project path="external/sonivox" name="platform/external/sonivox" 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="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-- 
cgit v1.2.3