summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.xml2
-rw-r--r--landing-snowball.xml2
-rw-r--r--linaro-default.xml2
-rw-r--r--staging-galaxynexus.xml2
-rw-r--r--staging-origen.xml2
-rw-r--r--staging-panda.xml2
-rw-r--r--staging-vexpress-rtsm-isw.xml2
-rw-r--r--staging-vexpress-rtsm.xml2
-rw-r--r--staging-vexpress.xml2
-rw-r--r--tracking-panda.xml2
-rw-r--r--tracking-vexpress.xml2
11 files changed, 11 insertions, 11 deletions
diff --git a/default.xml b/default.xml
index bec01ca..025e031 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 a1194f1..657cd51 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 78f30a3..b3f0afd 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 59f2cd8..14d44da 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 2150d8d..61aac00 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 75ccab1..c78f1d1 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 7857bf3..636dc82 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 bedaefa..fd7496f 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 4566e0b..f40a80b 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 96b07cd..b192ee8 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 e0132e7..3c5f9d1 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" />