summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-12 21:43:29 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-12 21:43:29 +0200
commitcefcb8af382253f497f1109ed632ebd54fd610f9 (patch)
tree7fb2c1124ecc74ab208c01e0b070edf5f6772ffb
parenta0823437dfc43e3eb1aa8d2b55dc611d9c866898 (diff)
downloadmanifest-cefcb8af382253f497f1109ed632ebd54fd610f9.tar.gz
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>
-rw-r--r--default.xml15
-rw-r--r--landing-snowball.xml15
-rw-r--r--linaro-default.xml15
-rw-r--r--staging-origen.xml15
-rw-r--r--staging-panda.xml15
-rw-r--r--staging-vexpress-rtsm-isw.xml15
-rw-r--r--staging-vexpress-rtsm.xml15
-rw-r--r--staging-vexpress.xml15
-rw-r--r--tracking-panda.xml15
-rw-r--r--tracking-vexpress.xml15
10 files changed, 100 insertions, 50 deletions
diff --git a/default.xml b/default.xml
index 86eddf5..4dc6d2f 100644
--- a/default.xml
+++ b/default.xml
@@ -81,19 +81,24 @@
<project path="bionic" name="platform/bionic" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: need porting -->
<project path="external/srec" name="platform/external/srec" revision="refs/tags/android-4.1.1_r4"/>
- <!-- 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"/>
<project path="system/security" name="platform/system/security" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
<project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.1" />
+ <!-- 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"/>
<!-- Linaro modifications: need to be restored -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="refs/tags/android-4.1.1_r4"/>
- <project path="external/freetype" name="platform/external/freetype" revision="refs/tags/android-4.1.1_r4"/>
- <project path="external/sonivox" name="platform/external/sonivox" revision="refs/tags/android-4.1.1_r4"/>
- <project path="external/openssl" name="platform/external/openssl" revision="refs/tags/android-4.1.1_r4"/>
<project path="libcore" name="platform/libcore" revision="refs/tags/android-4.1.1_r4"/>
<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"/>
diff --git a/landing-snowball.xml b/landing-snowball.xml
index b3f4124..aaf96d9 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -77,8 +77,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" />
@@ -103,10 +104,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" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 3773df8..625d9f1 100644
--- a/linaro-default.xml
+++ b/linaro-default.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" />
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" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 4389a04..422192e 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -74,8 +74,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" />
@@ -100,10 +101,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" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 47b142b..b4c615b 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -86,8 +86,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" />
@@ -113,10 +114,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" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index a510e79..10cbf1d 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -85,8 +85,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" />
@@ -112,10 +113,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" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index c0d6738..56b1e12 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -77,8 +77,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" />
@@ -103,10 +104,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" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 6311313..acb498a 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -73,8 +73,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" />
@@ -99,10 +100,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" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 3987c4c..55755f1 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.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" />