diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-04 16:34:00 +0200 |
---|---|---|
committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-04 16:34:00 +0200 |
commit | 662086444a6d3f4c1f150cea18364c36ad30efb4 (patch) | |
tree | b16bbfb4e0cf8ad63bd82322c6b175142f8847c9 | |
parent | e1e2b92a42ceef8baec7d311df4e713bf24502fd (diff) | |
download | manifest-662086444a6d3f4c1f150cea18364c36ad30efb4.tar.gz |
manifest: (All) Pull in linaro_android_4.0.4 branch of chromium
Pull in linaro-ified chromium for strict-aliasing fixes
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r-- | default.xml | 2 | ||||
-rw-r--r-- | fsl-iMX6.xml | 2 | ||||
-rw-r--r-- | landing-panda.xml | 2 | ||||
-rw-r--r-- | landing-snowball.xml | 2 | ||||
-rw-r--r-- | staging-iMX53.xml | 2 | ||||
-rw-r--r-- | staging-iMX6.xml | 2 | ||||
-rw-r--r-- | staging-origen.xml | 2 | ||||
-rw-r--r-- | staging-panda.xml | 2 | ||||
-rw-r--r-- | staging-vexpress-rtsm-isw.xml | 2 | ||||
-rw-r--r-- | staging-vexpress-rtsm.xml | 2 | ||||
-rw-r--r-- | staging-vexpress.xml | 2 | ||||
-rw-r--r-- | tracking-origen.xml | 2 | ||||
-rw-r--r-- | tracking-panda.xml | 2 | ||||
-rw-r--r-- | tracking-snowball.xml | 2 | ||||
-rw-r--r-- | tracking-vexpress.xml | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/default.xml b/default.xml index 8f6006575..630d1dc42 100644 --- a/default.xml +++ b/default.xml @@ -81,6 +81,7 @@ <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4" /> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -114,7 +115,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/fsl-iMX6.xml b/fsl-iMX6.xml index 0e686bd79..e3bbfb4dc 100644 --- a/fsl-iMX6.xml +++ b/fsl-iMX6.xml @@ -88,6 +88,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -121,7 +122,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/landing-panda.xml b/landing-panda.xml index c36e1a183..0f4339736 100644 --- a/landing-panda.xml +++ b/landing-panda.xml @@ -88,6 +88,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4" /> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -123,7 +124,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/landing-snowball.xml b/landing-snowball.xml index c302b136c..3780a8bb3 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -90,6 +90,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -123,7 +124,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/staging-iMX53.xml b/staging-iMX53.xml index df4404665..c22a2e6f0 100644 --- a/staging-iMX53.xml +++ b/staging-iMX53.xml @@ -86,6 +86,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -119,7 +120,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/staging-iMX6.xml b/staging-iMX6.xml index 5ad184468..e492f7a62 100644 --- a/staging-iMX6.xml +++ b/staging-iMX6.xml @@ -88,6 +88,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -121,7 +122,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/staging-origen.xml b/staging-origen.xml index ce4b0b565..e5180de34 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -91,6 +91,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -124,7 +125,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/staging-panda.xml b/staging-panda.xml index 2ca456032..623dcf608 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -85,6 +85,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4" /> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -118,7 +119,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml index 9d0676c97..92e3d5fea 100644 --- a/staging-vexpress-rtsm-isw.xml +++ b/staging-vexpress-rtsm-isw.xml @@ -92,6 +92,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -125,7 +126,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml index d53ce0450..f84fcc263 100644 --- a/staging-vexpress-rtsm.xml +++ b/staging-vexpress-rtsm.xml @@ -91,6 +91,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -124,7 +125,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/staging-vexpress.xml b/staging-vexpress.xml index d7f52951a..11886f122 100644 --- a/staging-vexpress.xml +++ b/staging-vexpress.xml @@ -87,6 +87,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -120,7 +121,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/tracking-origen.xml b/tracking-origen.xml index 83e021165..b86f3a52b 100644 --- a/tracking-origen.xml +++ b/tracking-origen.xml @@ -91,6 +91,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -124,7 +125,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/tracking-panda.xml b/tracking-panda.xml index fd0e893eb..f2e77ecbb 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -85,6 +85,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -118,7 +119,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/tracking-snowball.xml b/tracking-snowball.xml index ebf0059c6..29f351291 100644 --- a/tracking-snowball.xml +++ b/tracking-snowball.xml @@ -90,6 +90,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -123,7 +124,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml index 91abc232f..15b50ad83 100644 --- a/tracking-vexpress.xml +++ b/tracking-vexpress.xml @@ -87,6 +87,7 @@ <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/> <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" /> + <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -120,7 +121,6 @@ <project path="external/bouncycastle" name="platform/external/bouncycastle" /> <project path="external/bsdiff" name="platform/external/bsdiff" /> <project path="external/bzip2" name="platform/external/bzip2" /> - <project path="external/chromium" name="platform/external/chromium" /> <project path="external/collada" name="platform/external/collada" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> |