summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-15 21:29:05 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-15 21:29:05 +0200
commit58fce6b51c96e89e46e62908dc25c0bc2628deb0 (patch)
treea6bf9d1fe7dc4c42d9bc4d4cc0afff3ac72a7e69
parentdf95af818116f83067daf9f0f73fa519d1645674 (diff)
downloadmanifest-58fce6b51c96e89e46e62908dc25c0bc2628deb0.tar.gz
manifest: (All) Use Linaro branch of Chromium
The Linaro branch fixes some violations of aliasing rules Change-Id: Idc4ef23d96df47f273c7165d3d0e4b1edadf9c18 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-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 78f6a87..1d0e6ec 100644
--- a/default.xml
+++ b/default.xml
@@ -99,6 +99,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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"/>
<!-- Linaro modifications: need to be restored -->
@@ -117,7 +118,6 @@
<project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r4" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r4" />
<project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r4" />
- <project path="external/chromium" name="platform/external/chromium" revision="refs/tags/android-4.1.1_r4" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="refs/tags/android-4.1.1_r4" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" revision="refs/tags/android-4.1.1_r4" />
<project path="external/ping" name="platform/external/ping" revision="refs/tags/android-4.1.1_r4" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index e609cf9..904fcfd 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -113,6 +113,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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="external/llvm" name="platform/external/llvm" />
@@ -125,7 +126,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 7d335dd..5742cb7 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -112,6 +112,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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="external/llvm" name="platform/external/llvm" />
@@ -124,7 +125,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 1fad627..c889b5a 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -91,6 +91,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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"/>
<!-- Linaro modifications: need to be restored -->
@@ -110,7 +111,6 @@
<project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r4" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r4" />
<project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r4" />
- <project path="external/chromium" name="platform/external/chromium" revision="refs/tags/android-4.1.1_r4" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="refs/tags/android-4.1.1_r4" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" revision="refs/tags/android-4.1.1_r4" />
<project path="external/ping" name="platform/external/ping" revision="refs/tags/android-4.1.1_r4" />
diff --git a/staging-origen.xml b/staging-origen.xml
index df2126b..fac9a3c 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -112,6 +112,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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="external/llvm" name="platform/external/llvm" />
@@ -124,7 +125,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/staging-panda.xml b/staging-panda.xml
index aee7c26..d0cba94 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -110,6 +110,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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" />
<!-- Linaro modification: Add workaround for aliasing violation -->
@@ -124,7 +125,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 3ece895..c4e6d77 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -123,6 +123,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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" />
<!-- Linaro modification: Add workaround for aliasing violation -->
@@ -137,7 +138,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 67f8b56..c9351b9 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -122,6 +122,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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" />
<!-- Linaro modification: Add workaround for aliasing violation -->
@@ -136,7 +137,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 1930950..affa474 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -113,6 +113,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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" />
<!-- Linaro modification: Add workaround for aliasing violation -->
@@ -127,7 +128,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 5881984..c073f8a 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -109,6 +109,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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" />
<!-- Linaro modification: Add workaround for aliasing violation -->
@@ -123,7 +124,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 4bcf005..faadb5d 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -112,6 +112,7 @@
<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"/>
<project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
+ <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" />
<!-- Linaro modification: Add workaround for aliasing violation -->
@@ -126,7 +127,6 @@
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
- <project path="external/chromium" name="platform/external/chromium" />
<project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" />
<project path="external/ping" name="platform/external/ping" />