summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-19 21:28:26 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-08-19 21:28:26 +0000
commit38402e9a5ca0658de54a324978b9453cc0114f86 (patch)
treeba98a3e7bcecd62e5814232e99556565d6062d9c
parent63dc2b23ac88b4612689ed22bfd4f0f4259e6697 (diff)
parent0a4226227799b09b880faedd2149abc0e7c2f125 (diff)
downloadmanifest-38402e9a5ca0658de54a324978b9453cc0114f86.tar.gz
Merge "manifests: (All) Use Linaro version of mesa3d" into linaro_android_4.1.1
-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 9786217..0c4f68b 100644
--- a/default.xml
+++ b/default.xml
@@ -110,6 +110,7 @@
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
<project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: need to be restored -->
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
@@ -237,7 +238,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 9dd6919..7a8b9ec 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -123,6 +123,7 @@
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
<project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
@@ -240,7 +241,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 00a7adb..4ffa39b 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -120,6 +120,7 @@
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
<project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
@@ -239,7 +240,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 9cba0e8..c4ffd9a 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -102,6 +102,7 @@
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
<project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: need to be restored -->
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
@@ -230,7 +231,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/staging-origen.xml b/staging-origen.xml
index cf081fa..10f343f 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -122,6 +122,7 @@
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
@@ -239,7 +240,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/staging-panda.xml b/staging-panda.xml
index ed8bd8d..8c065e5 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -116,6 +116,7 @@
<!-- Linaro modifications: Use -fno-strict-aliasing -->
<project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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" />
@@ -237,7 +238,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 7f73519..98701d5 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -129,6 +129,7 @@
<project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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" />
@@ -249,7 +250,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 1607fb1..dc815bf 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -129,6 +129,7 @@
<project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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" />
@@ -248,7 +249,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index da9843f..602c76d 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -120,6 +120,7 @@
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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" />
@@ -240,7 +241,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 71a118c..b19361c 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -116,6 +116,7 @@
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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" />
@@ -236,7 +237,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 5d70c24..09a04b0 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -119,6 +119,7 @@
<project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" 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" />
@@ -239,7 +240,6 @@
<project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
<project path="external/markdown" name="platform/external/markdown" />
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
- <project path="external/mesa3d" name="platform/external/mesa3d" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mtpd" name="platform/external/mtpd" />