summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-09-10 10:46:12 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-09-10 10:46:12 +0000
commitf5836012b8b5865dbe24ff284e7e0e019ff0ce56 (patch)
treeb3e91ae30853cbdaddbaee801bb474a34ea965b2
parentc3f1311256df7cfd04681f33d9fff52d85736ac7 (diff)
parente3e02cfda6404c17d5112dfd1cdf4c527bad6114 (diff)
downloadmanifests_sandbox-f5836012b8b5865dbe24ff284e7e0e019ff0ce56.tar.gz
Merge "manifest: (All) Use Linaro branch of LegacyCamera" into linaro_android_4.1.1
-rw-r--r--default.xml3
-rw-r--r--landing-snowball.xml3
-rw-r--r--linaro-default.xml3
-rw-r--r--staging-galaxynexus.xml3
-rw-r--r--staging-origen.xml3
-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-snowball.xml2
-rw-r--r--tracking-vexpress.xml2
12 files changed, 17 insertions, 12 deletions
diff --git a/default.xml b/default.xml
index aea0ac1..5a58951 100644
--- a/default.xml
+++ b/default.xml
@@ -138,6 +138,8 @@
<!-- 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="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <!-- Linaro modification: ISO C++ 11 support -->
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -315,7 +317,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 4cd111a..3bbe602 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -145,6 +145,8 @@
<!-- 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="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <!-- Linaro modification: ISO C++ 11 support -->
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -316,7 +318,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 528812d..5a39814 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -144,6 +144,8 @@
<project path="system/extras" name="platform/system/extras" 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" />
+ <!-- Linaro modification: ISO C++ 11 support -->
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -318,7 +320,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 987d0ed..b46f029 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -131,6 +131,8 @@
<!-- 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="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <!-- Linaro modification: ISO C++ 11 support -->
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -308,7 +310,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/staging-origen.xml b/staging-origen.xml
index b59497f..84a8fdb 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -144,6 +144,8 @@
<!-- 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="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <!-- Linaro modification: ISO C++ 11 support -->
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -318,7 +320,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 688a903..fb09e83 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -137,6 +137,7 @@
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="external/libvpx" name="platform/external/libvpx" />
@@ -316,7 +317,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 9cc692f..ccacdda 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -148,6 +148,7 @@
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="external/libvpx" name="platform/external/libvpx" />
@@ -326,7 +327,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index d1524f6..98a932c 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -147,6 +147,7 @@
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="external/libvpx" name="platform/external/libvpx" />
@@ -325,7 +326,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 11ed6d7..108bc59 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -140,6 +140,7 @@
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="external/libvpx" name="platform/external/libvpx" />
@@ -319,7 +320,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 91c58a2..04e8331 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -136,6 +136,7 @@
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="external/libvpx" name="platform/external/libvpx" />
@@ -315,7 +316,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index 44d93f4..9f9a87d 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -134,6 +134,7 @@
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="external/libvpx" name="platform/external/libvpx" />
@@ -313,7 +314,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 8952020..204d241 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -140,6 +140,7 @@
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="external/libvpx" name="platform/external/libvpx" />
@@ -319,7 +320,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />